loader: Add AddressSpace loading support to ELFs
Add a new function load_elf_as() that allows the caller to specify an AddressSpace to use when loading the ELF. The original load_elf() function doesn't have any change in functionality. Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 8b5cefecdf56fba4ccdff2db880f0b6b264cf16f.1474331683.git.alistair.francis@xilinx.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
3e76099aac
commit
70bb1d16f4
|
@ -416,6 +416,18 @@ int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),
|
||||||
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
||||||
uint64_t *highaddr, int big_endian, int elf_machine,
|
uint64_t *highaddr, int big_endian, int elf_machine,
|
||||||
int clear_lsb, int data_swab)
|
int clear_lsb, int data_swab)
|
||||||
|
{
|
||||||
|
return load_elf_as(filename, translate_fn, translate_opaque, pentry,
|
||||||
|
lowaddr, highaddr, big_endian, elf_machine, clear_lsb,
|
||||||
|
data_swab, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* return < 0 if error, otherwise the number of bytes loaded in memory */
|
||||||
|
int load_elf_as(const char *filename,
|
||||||
|
uint64_t (*translate_fn)(void *, uint64_t),
|
||||||
|
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
||||||
|
uint64_t *highaddr, int big_endian, int elf_machine,
|
||||||
|
int clear_lsb, int data_swab, AddressSpace *as)
|
||||||
{
|
{
|
||||||
int fd, data_order, target_data_order, must_swab, ret = ELF_LOAD_FAILED;
|
int fd, data_order, target_data_order, must_swab, ret = ELF_LOAD_FAILED;
|
||||||
uint8_t e_ident[EI_NIDENT];
|
uint8_t e_ident[EI_NIDENT];
|
||||||
|
@ -455,11 +467,11 @@ int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),
|
||||||
if (e_ident[EI_CLASS] == ELFCLASS64) {
|
if (e_ident[EI_CLASS] == ELFCLASS64) {
|
||||||
ret = load_elf64(filename, fd, translate_fn, translate_opaque, must_swab,
|
ret = load_elf64(filename, fd, translate_fn, translate_opaque, must_swab,
|
||||||
pentry, lowaddr, highaddr, elf_machine, clear_lsb,
|
pentry, lowaddr, highaddr, elf_machine, clear_lsb,
|
||||||
data_swab);
|
data_swab, as);
|
||||||
} else {
|
} else {
|
||||||
ret = load_elf32(filename, fd, translate_fn, translate_opaque, must_swab,
|
ret = load_elf32(filename, fd, translate_fn, translate_opaque, must_swab,
|
||||||
pentry, lowaddr, highaddr, elf_machine, clear_lsb,
|
pentry, lowaddr, highaddr, elf_machine, clear_lsb,
|
||||||
data_swab);
|
data_swab, as);
|
||||||
}
|
}
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
|
|
|
@ -263,7 +263,8 @@ static int glue(load_elf, SZ)(const char *name, int fd,
|
||||||
void *translate_opaque,
|
void *translate_opaque,
|
||||||
int must_swab, uint64_t *pentry,
|
int must_swab, uint64_t *pentry,
|
||||||
uint64_t *lowaddr, uint64_t *highaddr,
|
uint64_t *lowaddr, uint64_t *highaddr,
|
||||||
int elf_machine, int clear_lsb, int data_swab)
|
int elf_machine, int clear_lsb, int data_swab,
|
||||||
|
AddressSpace *as)
|
||||||
{
|
{
|
||||||
struct elfhdr ehdr;
|
struct elfhdr ehdr;
|
||||||
struct elf_phdr *phdr = NULL, *ph;
|
struct elf_phdr *phdr = NULL, *ph;
|
||||||
|
@ -405,7 +406,7 @@ static int glue(load_elf, SZ)(const char *name, int fd,
|
||||||
snprintf(label, sizeof(label), "phdr #%d: %s", i, name);
|
snprintf(label, sizeof(label), "phdr #%d: %s", i, name);
|
||||||
|
|
||||||
/* rom_add_elf_program() seize the ownership of 'data' */
|
/* rom_add_elf_program() seize the ownership of 'data' */
|
||||||
rom_add_elf_program(label, data, file_size, mem_size, addr, NULL);
|
rom_add_elf_program(label, data, file_size, mem_size, addr, as);
|
||||||
|
|
||||||
total_size += mem_size;
|
total_size += mem_size;
|
||||||
if (addr < low)
|
if (addr < low)
|
||||||
|
|
|
@ -45,7 +45,7 @@ int load_image_gzipped(const char *filename, hwaddr addr, uint64_t max_sz);
|
||||||
#define ELF_LOAD_WRONG_ENDIAN -4
|
#define ELF_LOAD_WRONG_ENDIAN -4
|
||||||
const char *load_elf_strerror(int error);
|
const char *load_elf_strerror(int error);
|
||||||
|
|
||||||
/** load_elf:
|
/** load_elf_as:
|
||||||
* @filename: Path of ELF file
|
* @filename: Path of ELF file
|
||||||
* @translate_fn: optional function to translate load addresses
|
* @translate_fn: optional function to translate load addresses
|
||||||
* @translate_opaque: opaque data passed to @translate_fn
|
* @translate_opaque: opaque data passed to @translate_fn
|
||||||
|
@ -59,6 +59,8 @@ const char *load_elf_strerror(int error);
|
||||||
* @data_swab: Set to order of byte swapping for data. 0 for no swap, 1
|
* @data_swab: Set to order of byte swapping for data. 0 for no swap, 1
|
||||||
* for swapping bytes within halfwords, 2 for bytes within
|
* for swapping bytes within halfwords, 2 for bytes within
|
||||||
* words and 3 for within doublewords.
|
* words and 3 for within doublewords.
|
||||||
|
* @as: The AddressSpace to load the ELF to. The value of address_space_memory
|
||||||
|
* is used if nothing is supplied here.
|
||||||
*
|
*
|
||||||
* Load an ELF file's contents to the emulated system's address space.
|
* Load an ELF file's contents to the emulated system's address space.
|
||||||
* Clients may optionally specify a callback to perform address
|
* Clients may optionally specify a callback to perform address
|
||||||
|
@ -71,7 +73,16 @@ const char *load_elf_strerror(int error);
|
||||||
* If @elf_machine is EM_NONE then the machine type will be read from the
|
* If @elf_machine is EM_NONE then the machine type will be read from the
|
||||||
* ELF header and no checks will be carried out against the machine type.
|
* ELF header and no checks will be carried out against the machine type.
|
||||||
*/
|
*/
|
||||||
|
int load_elf_as(const char *filename,
|
||||||
|
uint64_t (*translate_fn)(void *, uint64_t),
|
||||||
|
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
||||||
|
uint64_t *highaddr, int big_endian, int elf_machine,
|
||||||
|
int clear_lsb, int data_swab, AddressSpace *as);
|
||||||
|
|
||||||
|
/** load_elf:
|
||||||
|
* Same as load_elf_as(), but doesn't allow the caller to specify an
|
||||||
|
* AddressSpace.
|
||||||
|
*/
|
||||||
int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),
|
int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),
|
||||||
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
||||||
uint64_t *highaddr, int big_endian, int elf_machine,
|
uint64_t *highaddr, int big_endian, int elf_machine,
|
||||||
|
|
Loading…
Reference in a new issue