vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
rather than 0x1b.
	(grub_console_getkey): Use correct jae opcode rather than ja.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-10-14 15:35:55 +02:00
parent 219b35646a
commit d87c681fd4
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2010-10-12 Robert Millan <rmh@gnu.org>
* util/grub-mkconfig.in: Merge `GRUB_DISABLE_LINUX_RECOVERY' and * util/grub-mkconfig.in: Merge `GRUB_DISABLE_LINUX_RECOVERY' and

4
grub-core/kern/i386/pc/startup.S
View file

@ -591,7 +591,7 @@ FUNCTION(grub_console_putchar)
LOCAL(bypass_table): LOCAL(bypass_table):
.word 0x0100 | '\e',0x0f00 | '\t', 0x0e00 | '\b', 0x1c00 | '\r' .word 0x011b, 0x0f00 | '\t', 0x0e00 | '\b', 0x1c00 | '\r'
.word 0x1c00 | '\n' .word 0x1c00 | '\n'
LOCAL(bypass_table_end): LOCAL(bypass_table_end):
@ -646,7 +646,7 @@ FUNCTION(grub_console_getkey)
andl %edx, %eax andl %edx, %eax
cmpl $0x20, %eax cmpl $0x20, %eax
ja 2f jae 2f
movl %edx, %eax movl %edx, %eax
leal LOCAL(bypass_table), %edi leal LOCAL(bypass_table), %edi
movl $((LOCAL(bypass_table_end) - LOCAL(bypass_table)) / 2), %ecx movl $((LOCAL(bypass_table_end) - LOCAL(bypass_table)) / 2), %ecx