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

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

Browse source 
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf32): Fix misc
        warnings introduced in my last commit.
This commit is contained in:
robertmh 2008-08-04 09:30:36 +00:00
parent 2960a0c228
commit a9053f8f5d
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-08-04 Robert Millan <rmh@aybabtu.com>
* loader/i386/pc/multiboot.c (grub_multiboot_load_elf32): Fix misc
warnings introduced in my last commit.
2008-08-03 Robert Millan <rmh@aybabtu.com> 2008-08-03 Robert Millan <rmh@aybabtu.com>
Make PCI available on all i386 architectures. Make PCI available on all i386 architectures.

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

@ -125,7 +125,6 @@ grub_multiboot_load_elf32 (grub_file_t file, void *buffer)
{ {
Elf32_Ehdr *ehdr = (Elf32_Ehdr *) buffer; Elf32_Ehdr *ehdr = (Elf32_Ehdr *) buffer;
char *phdr_base; char *phdr_base;
grub_addr_t physical_entry_addr = 0;
int lowest_segment = 0, highest_segment = 0; int lowest_segment = 0, highest_segment = 0;
int i; int i;
@ -162,20 +161,20 @@ grub_multiboot_load_elf32 (grub_file_t file, void *buffer)
if (! playground) if (! playground)
return grub_errno; return grub_errno;
grub_multiboot_payload_orig = playground + sizeof (forward_relocator); grub_multiboot_payload_orig = (long) playground + sizeof (forward_relocator);
grub_memmove (playground, forward_relocator, sizeof (forward_relocator)); grub_memmove (playground, forward_relocator, sizeof (forward_relocator));
grub_memmove (grub_multiboot_payload_orig + grub_multiboot_payload_size, backward_relocator, sizeof (backward_relocator)); grub_memmove ((char *) (grub_multiboot_payload_orig + grub_multiboot_payload_size), backward_relocator, sizeof (backward_relocator));
/* Load every loadable segment in memory. */ /* Load every loadable segment in memory. */
for (i = 0; i < ehdr->e_phnum; i++) for (i = 0; i < ehdr->e_phnum; i++)
{ {
if (phdr(i)->p_type == PT_LOAD) if (phdr(i)->p_type == PT_LOAD)
{ {
char *load_this_module_at = grub_multiboot_payload_orig + (phdr(i)->p_paddr - phdr(0)->p_paddr); char *load_this_module_at = (char *) (grub_multiboot_payload_orig + (phdr(i)->p_paddr - phdr(0)->p_paddr));
grub_dprintf ("multiboot_loader", "segment %d: paddr=%p, memsz=%p\n", grub_dprintf ("multiboot_loader", "segment %d: paddr=%p, memsz=0x%x\n",
i, phdr(i)->p_paddr, phdr(i)->p_memsz); i, (void *) 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)
@ -202,8 +201,8 @@ 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_dprintf ("multiboot_loader", "dest=%p, size=0x%x, entry_offset=0x%x\n",
grub_multiboot_payload_dest, (void *) grub_multiboot_payload_dest,
grub_multiboot_payload_size, grub_multiboot_payload_size,
grub_multiboot_payload_entry_offset); grub_multiboot_payload_entry_offset);