Commit ca20cf32 authored by Blue Swirl's avatar Blue Swirl
Browse files

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: default avatarBlue Swirl <blauwirbel@gmail.com>
parent a333cd71

Makefile.hw

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ VPATH=$(SRC_PATH):$(SRC_PATH)/hw 
QEMU_CFLAGS+=-I.. -I$(SRC_PATH)/fpu



obj-y =

obj-y += loader.o

obj-y += virtio.o

obj-y += fw_cfg.o

obj-y += watchdog.o

Makefile.target

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ endif 
# System emulator target

ifdef CONFIG_SOFTMMU



obj-y = vl.o monitor.o pci.o loader.o isa_mmio.o machine.o \

obj-y = vl.o monitor.o pci.o isa_mmio.o machine.o \

        gdbstub.o gdbstub-xml.o msix.o ioport.o

# virtio has to be here due to weird dependency between PCI and virtio-net.

# need to fix this properly

disas.h

+3 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include "qemu-common.h"



#ifdef NEED_CPU_H

/* Disassemble this for me please... (debugging). */

void disas(FILE *out, void *code, unsigned long size);

void target_disas(FILE *out, target_ulong code, target_ulong size, int flags);
@@ -15,12 +16,13 @@ void monitor_disas(Monitor *mon, CPUState *env, 


/* Look up symbol for debugging purpose.  Returns "" if unknown. */

const char *lookup_symbol(target_ulong orig_addr);

#endif



struct syminfo;

struct elf32_sym;

struct elf64_sym;



typedef const char *(*lookup_symbol_t)(struct syminfo *s, target_ulong orig_addr);

typedef const char *(*lookup_symbol_t)(struct syminfo *s, target_phys_addr_t orig_addr);



struct syminfo {

    lookup_symbol_t lookup_symbol;

hw/an5206.c

+5 −2
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include "mcf.h"

#include "sysemu.h"

#include "boards.h"

#include "loader.h"

#include "elf.h"



#define KERNEL_LOAD_ADDR 0x10000

#define AN5206_MBAR_ADDR 0x10000000
@@ -35,7 +37,7 @@ static void an5206_init(ram_addr_t ram_size, 
    CPUState *env;

    int kernel_size;

    uint64_t elf_entry;

    target_ulong entry;

    target_phys_addr_t entry;



    if (!cpu_model)

        cpu_model = "m5206";
@@ -66,7 +68,8 @@ static void an5206_init(ram_addr_t ram_size, 
        exit(1);

    }



    kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL);

    kernel_size = load_elf(kernel_filename, 0, &elf_entry, NULL, NULL,

                           1, ELF_MACHINE, 0);

    entry = elf_entry;

    if (kernel_size < 0) {

        kernel_size = load_uimage(kernel_filename, &entry, NULL, NULL);

hw/arm_boot.c

+12 −2
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
#include "hw.h"

#include "arm-misc.h"

#include "sysemu.h"

#include "loader.h"

#include "elf.h"



#define KERNEL_ARGS_ADDR 0x100

#define KERNEL_LOAD_ADDR 0x00010000
@@ -191,7 +193,8 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info) 
    int n;

    int is_linux = 0;

    uint64_t elf_entry;

    target_ulong entry;

    target_phys_addr_t entry;

    int big_endian;



    /* Load the kernel.  */

    if (!info->kernel_filename) {
@@ -206,8 +209,15 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info) 
        qemu_register_reset(main_cpu_reset, env);

    }



#ifdef TARGET_WORDS_BIGENDIAN

    big_endian = 1;

#else

    big_endian = 0;

#endif



    /* Assume that raw images are linux kernels, and ELF images are not.  */

    kernel_size = load_elf(info->kernel_filename, 0, &elf_entry, NULL, NULL);

    kernel_size = load_elf(info->kernel_filename, 0, &elf_entry, NULL, NULL,

                           big_endian, ELF_MACHINE, 1);

    entry = elf_entry;

    if (kernel_size < 0) {

        kernel_size = load_uimage(info->kernel_filename, &entry, NULL,