da34e65cb4
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
147 lines
4.5 KiB
C
147 lines
4.5 KiB
C
/*
|
|
* OpenRISC simulator for use as an IIS.
|
|
*
|
|
* Copyright (c) 2011-2012 Jia Liu <proljc@gmail.com>
|
|
* Feng Gao <gf91597@gmail.com>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "hw/hw.h"
|
|
#include "hw/boards.h"
|
|
#include "elf.h"
|
|
#include "hw/char/serial.h"
|
|
#include "net/net.h"
|
|
#include "hw/loader.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "hw/sysbus.h"
|
|
#include "sysemu/qtest.h"
|
|
|
|
#define KERNEL_LOAD_ADDR 0x100
|
|
|
|
static void main_cpu_reset(void *opaque)
|
|
{
|
|
OpenRISCCPU *cpu = opaque;
|
|
|
|
cpu_reset(CPU(cpu));
|
|
}
|
|
|
|
static void openrisc_sim_net_init(MemoryRegion *address_space,
|
|
hwaddr base,
|
|
hwaddr descriptors,
|
|
qemu_irq irq, NICInfo *nd)
|
|
{
|
|
DeviceState *dev;
|
|
SysBusDevice *s;
|
|
|
|
dev = qdev_create(NULL, "open_eth");
|
|
qdev_set_nic_properties(dev, nd);
|
|
qdev_init_nofail(dev);
|
|
|
|
s = SYS_BUS_DEVICE(dev);
|
|
sysbus_connect_irq(s, 0, irq);
|
|
memory_region_add_subregion(address_space, base,
|
|
sysbus_mmio_get_region(s, 0));
|
|
memory_region_add_subregion(address_space, descriptors,
|
|
sysbus_mmio_get_region(s, 1));
|
|
}
|
|
|
|
static void cpu_openrisc_load_kernel(ram_addr_t ram_size,
|
|
const char *kernel_filename,
|
|
OpenRISCCPU *cpu)
|
|
{
|
|
long kernel_size;
|
|
uint64_t elf_entry;
|
|
hwaddr entry;
|
|
|
|
if (kernel_filename && !qtest_enabled()) {
|
|
kernel_size = load_elf(kernel_filename, NULL, NULL,
|
|
&elf_entry, NULL, NULL, 1, EM_OPENRISC,
|
|
1, 0);
|
|
entry = elf_entry;
|
|
if (kernel_size < 0) {
|
|
kernel_size = load_uimage(kernel_filename,
|
|
&entry, NULL, NULL, NULL, NULL);
|
|
}
|
|
if (kernel_size < 0) {
|
|
kernel_size = load_image_targphys(kernel_filename,
|
|
KERNEL_LOAD_ADDR,
|
|
ram_size - KERNEL_LOAD_ADDR);
|
|
entry = KERNEL_LOAD_ADDR;
|
|
}
|
|
|
|
if (kernel_size < 0) {
|
|
fprintf(stderr, "QEMU: couldn't load the kernel '%s'\n",
|
|
kernel_filename);
|
|
exit(1);
|
|
}
|
|
cpu->env.pc = entry;
|
|
}
|
|
}
|
|
|
|
static void openrisc_sim_init(MachineState *machine)
|
|
{
|
|
ram_addr_t ram_size = machine->ram_size;
|
|
const char *cpu_model = machine->cpu_model;
|
|
const char *kernel_filename = machine->kernel_filename;
|
|
OpenRISCCPU *cpu = NULL;
|
|
MemoryRegion *ram;
|
|
int n;
|
|
|
|
if (!cpu_model) {
|
|
cpu_model = "or1200";
|
|
}
|
|
|
|
for (n = 0; n < smp_cpus; n++) {
|
|
cpu = cpu_openrisc_init(cpu_model);
|
|
if (cpu == NULL) {
|
|
fprintf(stderr, "Unable to find CPU definition!\n");
|
|
exit(1);
|
|
}
|
|
qemu_register_reset(main_cpu_reset, cpu);
|
|
main_cpu_reset(cpu);
|
|
}
|
|
|
|
ram = g_malloc(sizeof(*ram));
|
|
memory_region_init_ram(ram, NULL, "openrisc.ram", ram_size, &error_fatal);
|
|
vmstate_register_ram_global(ram);
|
|
memory_region_add_subregion(get_system_memory(), 0, ram);
|
|
|
|
cpu_openrisc_pic_init(cpu);
|
|
cpu_openrisc_clock_init(cpu);
|
|
|
|
serial_mm_init(get_system_memory(), 0x90000000, 0, cpu->env.irq[2],
|
|
115200, serial_hds[0], DEVICE_NATIVE_ENDIAN);
|
|
|
|
if (nd_table[0].used) {
|
|
openrisc_sim_net_init(get_system_memory(), 0x92000000,
|
|
0x92000400, cpu->env.irq[4], nd_table);
|
|
}
|
|
|
|
cpu_openrisc_load_kernel(ram_size, kernel_filename, cpu);
|
|
}
|
|
|
|
static void openrisc_sim_machine_init(MachineClass *mc)
|
|
{
|
|
mc->desc = "or32 simulation";
|
|
mc->init = openrisc_sim_init;
|
|
mc->max_cpus = 1;
|
|
mc->is_default = 1;
|
|
}
|
|
|
|
DEFINE_MACHINE("or32-sim", openrisc_sim_machine_init)
|