ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mips_mipssim: Use cpu_mips_init() to obtain MIPSCPU 

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:17:49 +02:00
parent 1004ee8d26
commit 7ee274c193
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_mipssim.c
View File

@ -140,6 +140,7 @@ mips_mipssim_init (ram_addr_t ram_size,
MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *bios = g_new(MemoryRegion, 1); MemoryRegion *bios = g_new(MemoryRegion, 1);
MIPSCPU *cpu;
CPUMIPSState *env; CPUMIPSState *env;
ResetData *reset_info; ResetData *reset_info;
int bios_size; int bios_size;
@ -152,11 +153,13 @@ mips_mipssim_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;