Both mmu_init() and mvp_init() allocate structures, so call cpu_mips_register only when creating a CPU.
In addition, maybe some of the some of the field initialization stuff in cpu_mips_register, mmu_init, mvp_init, fpu_init etc. should be moved to cpu_reset instead, in case the fields should be reset to original values during CPU reset. Maximally only the env->mvp etc. structure allocation would be left to cpu_mips_register. This is the minimal version, but it may be incorrect. Comments? Signed-off-by: Blue Swirl <blauwir...@gmail.com> --- target-mips/translate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/target-mips/translate.c b/target-mips/translate.c index 58f483f..738efb7 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -8601,6 +8601,7 @@ CPUMIPSState *cpu_mips_init (const char *cpu_model) cpu_exec_init(env); env->cpu_model_str = cpu_model; + cpu_mips_register(env, def); mips_tcg_init(); cpu_reset(env); qemu_init_vcpu(env); @@ -8654,7 +8655,6 @@ void cpu_reset (CPUMIPSState *env) env->hflags = MIPS_HFLAG_CP0; #endif env->exception_index = EXCP_NONE; - cpu_mips_register(env, env->cpu_model); } void gen_pc_load(CPUState *env, TranslationBlock *tb, -- 1.6.2.4