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

Adjust mips/linux.c

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-04-22 02:45:06 +02:00
parent a51df0a1b4
commit 530a4814cc
1 changed files with 36 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
loader/mips/linux.c
View file

@ -33,9 +33,6 @@
#include <grub/pci.h> #include <grub/pci.h>
#include <grub/machine/time.h> #include <grub/machine/time.h>
#define ELF32_LOADMASK (0x00000000UL)
#define ELF64_LOADMASK (0x0000000000000000ULL)
static grub_dl_t my_mod; static grub_dl_t my_mod;
static int loaded; static int loaded;
@ -85,7 +82,7 @@ grub_linux_load32 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
grub_err_t err; grub_err_t err;
/* Linux's entry point incorrectly contains a virtual address. */ /* Linux's entry point incorrectly contains a virtual address. */
entry_addr = elf->ehdr.ehdr32.e_entry & ~ELF32_LOADMASK; entry_addr = elf->ehdr.ehdr32.e_entry;
linux_size = grub_elf32_size (elf, &base); linux_size = grub_elf32_size (elf, &base);
if (linux_size == 0) if (linux_size == 0)
@ -101,10 +98,15 @@ grub_linux_load32 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
if (!relocator) if (!relocator)
return grub_errno; return grub_errno;
err = grub_relocator_alloc_chunk_addr (relocator, (void **) &playground, {
target_addr, linux_size); grub_relocator_chunk_t ch;
err = grub_relocator_alloc_chunk_addr (relocator, &ch,
target_addr & 0x1fffffff,
linux_size);
if (err) if (err)
return err; return err;
playground = get_virtual_current_address (ch);
}
*extra_mem = playground + extraoff; *extra_mem = playground + extraoff;
@ -135,7 +137,7 @@ grub_linux_load64 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
grub_err_t err; grub_err_t err;
/* Linux's entry point incorrectly contains a virtual address. */ /* Linux's entry point incorrectly contains a virtual address. */
entry_addr = elf->ehdr.ehdr64.e_entry & ~ELF64_LOADMASK; entry_addr = elf->ehdr.ehdr64.e_entry;
linux_size = grub_elf64_size (elf, &base); linux_size = grub_elf64_size (elf, &base);
if (linux_size == 0) if (linux_size == 0)
@ -151,10 +153,15 @@ grub_linux_load64 (grub_elf_t elf, void **extra_mem, grub_size_t extra_size)
if (!relocator) if (!relocator)
return grub_errno; return grub_errno;
err = grub_relocator_alloc_chunk_addr (relocator, (void **) &playground, {
target_addr, linux_size); grub_relocator_chunk_t ch;
err = grub_relocator_alloc_chunk_addr (relocator, &ch,
target_addr & 0x1fffffff,
linux_size);
if (err) if (err)
return err; return err;
playground = get_virtual_current_address (ch);
}
*extra_mem = playground + extraoff; *extra_mem = playground + extraoff;
@ -344,8 +351,10 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
size = grub_file_size (file); size = grub_file_size (file);
err = grub_relocator_alloc_chunk_align (relocator, &initrd_src, {
&initrd_dest, grub_relocator_chunk_t ch;
err = grub_relocator_alloc_chunk_align (relocator, &ch,
target_addr + linux_size + 0x10000, target_addr + linux_size + 0x10000,
(0xffffffff - size) + 1, (0xffffffff - size) + 1,
size, 0x10000, size, 0x10000,
@ -356,6 +365,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
grub_file_close (file); grub_file_close (file);
return err; return err;
} }
initrd_src = get_virtual_current_address (ch);
initrd_dest = get_physical_target_address (ch) | 0x80000000;
}
if (grub_file_read (file, initrd_src, size) != size) if (grub_file_read (file, initrd_src, size) != size)
{ {