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

* mmap/i386/pc/mmap_helper.S: Set CF on return.

Browse source
This commit is contained in:
Josh Triplett 2010-06-28 10:17:57 +02:00 • committed by Vladimir 'phcoder' Serbinenko
parent c06e40f728
commit dec53e635c
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2010-06-28 Josh Triplett <josh@joshtriplett.org>
* mmap/i386/pc/mmap_helper.S: Set CF on return.
2010-06-28 Colin Watson <cjwatson@ubuntu.com> 2010-06-28 Colin Watson <cjwatson@ubuntu.com>
* util/grub-install.in: Add --debug-image= option. * util/grub-install.in: Add --debug-image= option.

14
mmap/i386/pc/mmap_helper.S
View file

@ -59,7 +59,7 @@ LOCAL (e801):
movw %bx, %dx movw %bx, %dx
pop %ds pop %ds
clc clc
iret jmp LOCAL (iret_cf)
LOCAL (h88): LOCAL (h88):
popf popf
@ -69,7 +69,7 @@ LOCAL (h88):
movw DS (LOCAL (kbin16mb)), %ax movw DS (LOCAL (kbin16mb)), %ax
pop %ds pop %ds
clc clc
iret jmp LOCAL (iret_cf)
LOCAL (e820): LOCAL (e820):
popf popf
@ -101,12 +101,18 @@ LOCAL (noclean):
mov $0x534d4150, %eax mov $0x534d4150, %eax
pop %ds pop %ds
clc clc
iret jmp LOCAL (iret_cf)
LOCAL (errexit): LOCAL (errexit):
mov $0x534d4150, %eax mov $0x534d4150, %eax
pop %ds pop %ds
stc
xor %bx, %bx xor %bx, %bx
stc
LOCAL (iret_cf):
push %bp
mov %sp, %bp
setc 6(%bp)
pop %bp
iret iret
VARIABLE(grub_machine_mmaphook_mmap_num) VARIABLE(grub_machine_mmaphook_mmap_num)