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

2008-08-02 Robert Millan <rmh@aybabtu.com>

Browse source 
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf32): Add a pair
        of informational grub_dprintf() calls.
This commit is contained in:
robertmh 2008-08-02 15:51:12 +00:00
parent 3bd0a12aca
commit 93808428ce
2 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-08-02 Robert Millan <rmh@aybabtu.com>
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf32): Add a pair
of informational grub_dprintf() calls.
2008-08-02 Robert Millan <rmh@aybabtu.com> 2008-08-02 Robert Millan <rmh@aybabtu.com>
* disk/memdisk.c (memdisk_size): Don't initialize. * disk/memdisk.c (memdisk_size): Don't initialize.

8
loader/i386/pc/multiboot.c
View file

@ -174,6 +174,9 @@ grub_multiboot_load_elf32 (grub_file_t file, void *buffer)
{ {
char *load_this_module_at = grub_multiboot_payload_orig + (phdr(i)->p_paddr - phdr(0)->p_paddr); char *load_this_module_at = grub_multiboot_payload_orig + (phdr(i)->p_paddr - phdr(0)->p_paddr);
grub_dprintf ("multiboot_loader", "segment %d: paddr=%p, memsz=%p\n",
i, phdr(i)->p_paddr, phdr(i)->p_memsz);
if (grub_file_seek (file, (grub_off_t) phdr(i)->p_offset) if (grub_file_seek (file, (grub_off_t) phdr(i)->p_offset)
== (grub_off_t) -1) == (grub_off_t) -1)
return grub_error (GRUB_ERR_BAD_OS, return grub_error (GRUB_ERR_BAD_OS,
@ -199,6 +202,11 @@ grub_multiboot_load_elf32 (grub_file_t file, void *buffer)
else else
entry = (grub_addr_t) grub_multiboot_payload_orig + grub_multiboot_payload_size; entry = (grub_addr_t) grub_multiboot_payload_orig + grub_multiboot_payload_size;
grub_dprintf ("multiboot_loader", "dest=%p, size=%p, entry_offset=%p\n",
grub_multiboot_payload_dest,
grub_multiboot_payload_size,
grub_multiboot_payload_entry_offset);
return grub_errno; return grub_errno;
} }