diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2009-09-20 14:58:02 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-09-20 14:58:02 +0000 |
| commit | ca20cf32ab3d945155141ef737f5d08ebb373e1d (patch) | |
| tree | 45515350fdf7b5322658095beec591565a78506d /hw/mips_mipssim.c | |
| parent | a333cd7166d12397635e16dcade28da5ba8ec7b3 (diff) | |
Compile loader only once
Callers must pass ELF machine, byte swapping and symbol LSB clearing
information to ELF loader. A.out loader needs page size information, pass
that too as a parameter.
Extract prototypes to a separate file. Move loader.[ch] and elf_ops.h under hw.
Adjust callers. Also use target_phys_addr_t instead of target_ulong for
addresses: loader addresses aren't virtual.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/mips_mipssim.c')
| -rw-r--r-- | hw/mips_mipssim.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c index 6080dc825e..9aed40e1bd 100644 --- a/hw/mips_mipssim.c +++ b/hw/mips_mipssim.c @@ -32,6 +32,8 @@ #include "sysemu.h" #include "boards.h" #include "mips-bios.h" +#include "loader.h" +#include "elf.h" #ifdef TARGET_MIPS64 #define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffULL) @@ -54,10 +56,17 @@ static void load_kernel (CPUState *env) long kernel_size; long initrd_size; ram_addr_t initrd_offset; + int big_endian; + +#ifdef TARGET_WORDS_BIGENDIAN + big_endian = 1; +#else + big_endian = 0; +#endif kernel_size = load_elf(loaderparams.kernel_filename, VIRT_TO_PHYS_ADDEND, (uint64_t *)&entry, (uint64_t *)&kernel_low, - (uint64_t *)&kernel_high); + (uint64_t *)&kernel_high, big_endian, ELF_MACHINE, 1); if (kernel_size >= 0) { if ((entry & ~0x7fffffffULL) == 0x80000000) entry = (int32_t)entry; |