2009-12-13 Robert Millan <rmh.grub@aybabtu.com>
* loader/i386/multiboot_elfxx.c (CONCAT(grub_multiboot_load_elf, XX)): Fix `grub_multiboot_payload_eip' initialization.
This commit is contained in:
parent
3e8c081543
commit
616da3a154
2 changed files with 8 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
|||
2009-12-13 Robert Millan <rmh.grub@aybabtu.com>
|
||||
|
||||
* loader/i386/multiboot_elfxx.c
|
||||
(CONCAT(grub_multiboot_load_elf, XX)): Fix `grub_multiboot_payload_eip'
|
||||
initialization.
|
||||
|
||||
2009-11-28 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
Relocator framework
|
||||
|
|
|
@ -138,7 +138,8 @@ CONCAT(grub_multiboot_load_elf, XX) (grub_file_t file, void *buffer)
|
|||
if (phdr(i)->p_vaddr <= ehdr->e_entry
|
||||
&& phdr(i)->p_vaddr + phdr(i)->p_memsz > ehdr->e_entry)
|
||||
{
|
||||
grub_multiboot_payload_eip = ehdr->e_entry;
|
||||
grub_multiboot_payload_eip = grub_multiboot_payload_dest
|
||||
+ (ehdr->e_entry - phdr(i)->p_vaddr) + (phdr(i)->p_paddr - phdr(lowest_segment)->p_paddr);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue