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

Apple assembly doesn't handle symbol arithmetic well. So define an

Browse source 
offset symbol in boot.S and use it.
This commit is contained in:
Vladimir Serbinenko 2013-11-24 06:20:10 +01:00
parent 78f961efe9
commit 5c066a81c2
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-11-24 Vladimir Serbinenko <phcoder@gmail.com>
Apple assembly doesn't handle symbol arithmetic well. So define an
offset symbol in boot.S and use it.
2013-11-24 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-24 Vladimir Serbinenko <phcoder@gmail.com>
Apple assembly doesn't handle symbol arithmetic well. So instead Apple assembly doesn't handle symbol arithmetic well. So instead

10
grub-core/boot/i386/pc/boot.S
View file

@ -31,7 +31,7 @@
.macro floppy .macro floppy
part_start: part_start:
probe_values: LOCAL(probe_values):
.byte 36, 18, 15, 9, 0 .byte 36, 18, 15, 9, 0
LOCAL(floppy_probe): LOCAL(floppy_probe):
@ -39,8 +39,12 @@ LOCAL(floppy_probe):
/* /*
* Perform floppy probe. * Perform floppy probe.
*/ */
#ifdef __APPLE__
movw MACRO_DOLLAR(probe_values) - 1, %si LOCAL(probe_values_minus_one) = LOCAL(probe_values) - 1
movw MACRO_DOLLAR(LOCAL(probe_values_minus_one)), %si
#else
movw MACRO_DOLLAR(LOCAL(probe_values)) - 1, %si
#endif
LOCAL(probe_loop): LOCAL(probe_loop):
/* reset floppy controller INT 13h AH=0 */ /* reset floppy controller INT 13h AH=0 */