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

* grub-core/boot/i386/pc/startup_raw.S [__APPLE__]: Add Apple assembly

Browse source 
version.
	* grub-core/commands/i386/pc/drivemap_int13h.S [__APPLE__]: Likewise.
	* grub-core/kern/i386/pc/startup.S [__APPLE__]: Likewise.
	* grub-core/lib/i386/relocator16.S [__APPLE__]: Likewise.
	* grub-core/lib/i386/relocator_common.S [__APPLE__]: Likewise.
	* grub-core/mmap/i386/pc/mmap_helper.S [__APPLE__]: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-28 17:51:57 +02:00
parent e6ad0555e4
commit f7143efe1b
7 changed files with 163 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,6 +44,9 @@
#include <config.h>
#include <grub/symbol.h>
#include <multiboot.h>
#ifdef __APPLE__
#include <grub/i386/pc/memory.h>
#endif
.file "startup.S"
@ -53,6 +56,9 @@
start:
_start:
__start:
#ifdef __APPLE__
LOCAL(start):
#endif
.code32
movl %ecx, (LOCAL(real_to_prot_addr) - _start) (%esi)
@ -60,7 +66,12 @@ __start:
movl %eax, (EXT_C(grub_realidt) - _start) (%esi)
/* copy back the decompressed part (except the modules) */
#ifdef __APPLE__
movl $EXT_C(_edata), %ecx
subl $LOCAL(start), %ecx
#else
movl $(_edata - _start), %ecx
#endif
movl $(_start), %edi
rep
movsb
@ -84,11 +95,19 @@ LOCAL(cont):
movsb
#endif
#ifdef __APPLE__
/* clean out the bss */
movl $EXT_C(_edata), %edi
/* compute the bss length */
movl $GRUB_MEMORY_MACHINE_SCRATCH_ADDR, %ecx
#else
/* clean out the bss */
movl $BSS_START_SYMBOL, %edi
/* compute the bss length */
movl $END_SYMBOL, %ecx
#endif
subl %edi, %ecx
/* clean out */
@ -182,6 +201,13 @@ FUNCTION(grub_pxe_call)
VARIABLE(grub_realidt)
.long 0
#ifdef __APPLE__
.globl EXT_C(_edata)
.globl EXT_C(grub_boot_device)
.zerofill __DATA, __aa_before_bss, EXT_C(_edata), 1, 0
.zerofill __DATA, __bss, EXT_C(grub_boot_device), 4, 2
#else
.bss
VARIABLE(grub_boot_device)
.long 0
#endif