mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 17:53:56 -06:00
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>
This commit is contained in:
parent
a333cd7166
commit
ca20cf32ab
36 changed files with 234 additions and 96 deletions
12
hw/armv7m.c
12
hw/armv7m.c
|
@ -10,6 +10,8 @@
|
|||
#include "sysbus.h"
|
||||
#include "arm-misc.h"
|
||||
#include "sysemu.h"
|
||||
#include "loader.h"
|
||||
#include "elf.h"
|
||||
|
||||
/* Bitbanded IO. Each word corresponds to a single bit. */
|
||||
|
||||
|
@ -166,6 +168,7 @@ qemu_irq *armv7m_init(int flash_size, int sram_size,
|
|||
uint64_t entry;
|
||||
uint64_t lowaddr;
|
||||
int i;
|
||||
int big_endian;
|
||||
|
||||
flash_size *= 1024;
|
||||
sram_size *= 1024;
|
||||
|
@ -206,7 +209,14 @@ qemu_irq *armv7m_init(int flash_size, int sram_size,
|
|||
pic[i] = qdev_get_gpio_in(nvic, i);
|
||||
}
|
||||
|
||||
image_size = load_elf(kernel_filename, 0, &entry, &lowaddr, NULL);
|
||||
#ifdef TARGET_WORDS_BIGENDIAN
|
||||
big_endian = 1;
|
||||
#else
|
||||
big_endian = 0;
|
||||
#endif
|
||||
|
||||
image_size = load_elf(kernel_filename, 0, &entry, &lowaddr, NULL,
|
||||
big_endian, ELF_MACHINE, 1);
|
||||
if (image_size < 0) {
|
||||
image_size = load_image_targphys(kernel_filename, 0, flash_size);
|
||||
lowaddr = 0;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue