mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 14:59:34 +00:00
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:
1 parent
3e8c081543
commit
616da3a154
2 files changed
+8
-1
No files matched your search
@@ -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>
|
2009-11-28 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
Relocator framework
|
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
|
if (phdr(i)->p_vaddr <= ehdr->e_entry
|
||||||
&& phdr(i)->p_vaddr + phdr(i)->p_memsz > 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;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user