. 撤销吸收命令行尾部的空格。增加变量：当前水平像素(0x834c)。

chenall · Jan 18, 2022 · d38a055 · d38a055
1 parent 9957073
commit d38a055
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/ChangeLog_chenall.txt b/ChangeLog_chenall.txt
@@ -1,4 +1,7 @@
 更新说明：
+2022-01-18 (yaya)
+  撤销吸收命令行尾部的空格。增加变量：当前水平像素(0x834c)。
+
 2021-10-15 (yaya)
   修复管道符‘|’后面紧接call(或者goto)标签时，必须补空格。issues #341
 

diff --git a/stage2/asm.S b/stage2/asm.S
@@ -345,7 +345,7 @@ VARIABLE(buf_track)
 	.long	0	/* buf_track will grow to 64-bit */
 VARIABLE(buf_drive)
 	.long	-1
-	.long	0	/* padding */
+VARIABLE(current_x_resolution)	//0x834c  µ±Ç°Ë®Æ½ÏñËØ int
 
 	. = EXT_C(main) + 0x150
 

diff --git a/stage2/cmdline.c b/stage2/cmdline.c
@@ -300,15 +300,6 @@ int run_line (char *heap,int flags)
    int ret = 0;
    int arg_len = strlen(heap) + 1;
 
-   //吸收命令行尾部空格
-   char *p = heap;
-   while (*p++);
-   while (*(p - 2) == ' ' || *(p - 2) == '\t')
-   {
-     *(p - 2) = 0;
-     p--;
-   }
-
    cmd_buffer += (arg_len + 0xf) & -0x10;
    memmove(cmdline_buf,heap,arg_len);
    heap = cmdline_buf;

diff --git a/stage2/graphics.c b/stage2/graphics.c
@@ -65,7 +65,7 @@ unsigned long xpixels = 640;
 unsigned long ypixels = 480;
 unsigned long plano_size = 38400;
 unsigned long graphics_mode = 3;
-unsigned long current_x_resolution;
+//unsigned long current_x_resolution;
 unsigned long current_y_resolution;
 unsigned long current_bits_per_pixel;
 unsigned long current_bytes_per_scanline;