OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

virtex_ml507: Let ppc440_init_xilinx() return PowerPCCPU

Browse Source 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Andreas Färber 2012-05-04 17:59:06 +02:00
parent d1d4938ba8
commit 68281699ac
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/virtex_ml507.c
View File

@ -78,10 +78,10 @@ static void mmubooke_create_initial_mapping(CPUPPCState *env,
tlb->PID = 0; tlb->PID = 0;
} }
static CPUPPCState *ppc440_init_xilinx(ram_addr_t *ram_size, static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *ram_size,
int do_init, int do_init,
const char *cpu_model, const char *cpu_model,
uint32_t sysclk) uint32_t sysclk)
{ {
PowerPCCPU *cpu; PowerPCCPU *cpu;
CPUPPCState *env; CPUPPCState *env;
@ -103,7 +103,7 @@ static CPUPPCState *ppc440_init_xilinx(ram_addr_t *ram_size,
irqs[PPCUIC_OUTPUT_INT] = ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_INT]; irqs[PPCUIC_OUTPUT_INT] = ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_INT];
irqs[PPCUIC_OUTPUT_CINT] = ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_CINT]; irqs[PPCUIC_OUTPUT_CINT] = ((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_CINT];
ppcuic_init(env, irqs, 0x0C0, 0, 1); ppcuic_init(env, irqs, 0x0C0, 0, 1);
return env; return cpu;
} }
static void main_cpu_reset(void *opaque) static void main_cpu_reset(void *opaque)
@ -190,6 +190,7 @@ static void virtex_init(ram_addr_t ram_size,
{ {
MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *address_space_mem = get_system_memory();
DeviceState *dev; DeviceState *dev;
PowerPCCPU *cpu;
CPUPPCState *env; CPUPPCState *env;
target_phys_addr_t ram_base = 0; target_phys_addr_t ram_base = 0;
DriveInfo *dinfo; DriveInfo *dinfo;
@ -203,7 +204,8 @@ static void virtex_init(ram_addr_t ram_size,
cpu_model = "440-Xilinx"; cpu_model = "440-Xilinx";
} }
env = ppc440_init_xilinx(&ram_size, 1, cpu_model, 400000000); cpu = ppc440_init_xilinx(&ram_size, 1, cpu_model, 400000000);
env = &cpu->env;
qemu_register_reset(main_cpu_reset, env); qemu_register_reset(main_cpu_reset, env);
memory_region_init_ram(phys_ram, "ram", ram_size); memory_region_init_ram(phys_ram, "ram", ram_size);