mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mips_r4k: Use cpu_mips_init() to obtain MIPSCPU

Browse Source 
Needed for main_cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2012-05-05 14:21:43 +02:00
parent 2d44fc8e2e
commit 9ac67e2168
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/mips_r4k.c
View File

@ -162,6 +162,7 @@ void mips_r4k_init (ram_addr_t ram_size,
MemoryRegion *bios; MemoryRegion *bios;
MemoryRegion *iomem = g_new(MemoryRegion, 1); MemoryRegion *iomem = g_new(MemoryRegion, 1);
int bios_size; int bios_size;
MIPSCPU *cpu;
CPUMIPSState *env; CPUMIPSState *env;
ResetData *reset_info; ResetData *reset_info;
int i; int i;
@ -179,11 +180,13 @@ void mips_r4k_init (ram_addr_t ram_size,
cpu_model = "24Kf"; cpu_model = "24Kf";
#endif #endif
} }
env = cpu_init(cpu_model); cpu = cpu_mips_init(cpu_model);
if (!env) { if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n"); fprintf(stderr, "Unable to find CPU definition\n");
exit(1); exit(1);
} }
env = &cpu->env;
reset_info = g_malloc0(sizeof(ResetData)); reset_info = g_malloc0(sizeof(ResetData));
reset_info->env = env; reset_info->env = env;
reset_info->vector = env->active_tc.PC; reset_info->vector = env->active_tc.PC;