* grub-core/kern/i386/pc/startup.S (bypass_table): Use 0x1b explicitly

	rather than 0x1b.
	(grub_console_getkey): Use correct jae opcode rather than ja.

diff --git a/ChangeLog b/ChangeLog
index b0b3f83b0be558b0c878b4d310ced4e50dfe904d..a0ae8b2a0712b01ca372311bb4c8cb633bc56e49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/i386/pc/startup.S (bypass_table): Use 0x1b explicitly
+       rather than 0x1b.
+       (grub_console_getkey): Use correct jae opcode rather than ja.
+
 2010-10-12  Robert Millan  <rmh@gnu.org>
 
        * util/grub-mkconfig.in: Merge `GRUB_DISABLE_LINUX_RECOVERY' and

diff --git a/grub-core/kern/i386/pc/startup.S b/grub-core/kern/i386/pc/startup.S
index 31bd86c6531565ddbb2065aeb8d591a1a54b705a..e03fc8301bf55250352e5ac99cd8654bb9677a66 100644 (file)
--- a/grub-core/kern/i386/pc/startup.S
+++ b/grub-core/kern/i386/pc/startup.S
@@ -591,7 +591,7 @@ FUNCTION(grub_console_putchar)
 
 
 LOCAL(bypass_table):
-       .word 0x0100 | '\e',0x0f00 | '\t', 0x0e00 | '\b', 0x1c00 | '\r'
+       .word 0x011b, 0x0f00 | '\t', 0x0e00 | '\b', 0x1c00 | '\r'
        .word 0x1c00 | '\n'
 LOCAL(bypass_table_end):
 
@@ -646,7 +646,7 @@ FUNCTION(grub_console_getkey)
 
        andl    %edx, %eax
        cmpl    $0x20, %eax
-       ja      2f
+       jae     2f
        movl    %edx, %eax
        leal    LOCAL(bypass_table), %edi
        movl    $((LOCAL(bypass_table_end) - LOCAL(bypass_table)) / 2), %ecx