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

merge ia64-emu into ia64

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-01-02 23:55:50 +01:00
commit 7edf63fce6
45 changed files with 882 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

5
grub-core/loader/i386/bsd.c
View file

@ -746,6 +746,7 @@ grub_freebsd_boot (void)
grub_memcpy (&stack[9], &bi, sizeof (bi));
state.eip = entry;
state.esp = stack_target;
state.ebp = stack_target;
stack[0] = entry; /* "Return" address. */
stack[1] = bootflags | FREEBSD_RB_BOOTINFO;
stack[2] = bootdev;
@ -830,7 +831,8 @@ grub_openbsd_boot (void)
#endif
state.eip = entry;
state.esp = ((grub_uint8_t *) stack - (grub_uint8_t *) buf0) + buf_target;
state.ebp = state.esp
= ((grub_uint8_t *) stack - (grub_uint8_t *) buf0) + buf_target;
stack[0] = entry;
stack[1] = bootflags;
stack[2] = openbsd_root;
@ -1045,6 +1047,7 @@ grub_netbsd_boot (void)
state.eip = entry;
state.esp = stack_target;
state.ebp = stack_target;
stack[0] = entry;
stack[1] = bootflags;
stack[2] = 0;

2
grub-core/loader/i386/linux.c
View file

@ -716,7 +716,7 @@ grub_linux_boot (void)
/* FIXME. */
/* asm volatile ("lidt %0" : : "m" (idt_desc)); */
state.ebx = 0;
state.ebp = state.edi = state.ebx = 0;
state.esi = real_mode_target;
state.esp = real_mode_target;
state.eip = params->code32_start;

2
grub-core/loader/i386/xnu.c
View file

@ -836,6 +836,7 @@ grub_xnu_boot_resume (void)
struct grub_relocator32_state state;
state.esp = grub_xnu_stack;
state.ebp = grub_xnu_stack;
state.eip = grub_xnu_entry_point;
state.eax = grub_xnu_arg1;
@ -1114,6 +1115,7 @@ grub_xnu_boot (void)
state.eip = grub_xnu_entry_point;
state.eax = grub_xnu_arg1;
state.esp = grub_xnu_stack;
state.ebp = grub_xnu_stack;
return grub_relocator32_boot (grub_xnu_relocator, state);
}