diff options
-rw-r--r-- | target-unicore32/cpu.c | 6 | ||||
-rw-r--r-- | target-unicore32/helper.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c index 8de17a49d6..7bcf3b3658 100644 --- a/target-unicore32/cpu.c +++ b/target-unicore32/cpu.c @@ -95,6 +95,7 @@ static void uc32_cpu_initfn(Object *obj) { UniCore32CPU *cpu = UNICORE32_CPU(obj); CPUUniCore32State *env = &cpu->env; + static bool inited; cpu_exec_init(env); @@ -107,6 +108,11 @@ static void uc32_cpu_initfn(Object *obj) #endif tlb_flush(env, 1); + + if (tcg_enabled() && !inited) { + inited = true; + uc32_translate_init(); + } } static const VMStateDescription vmstate_uc32_cpu = { diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c index 2442133319..7eeb9bc633 100644 --- a/target-unicore32/helper.c +++ b/target-unicore32/helper.c @@ -30,7 +30,6 @@ CPUUniCore32State *uc32_cpu_init(const char *cpu_model) UniCore32CPU *cpu; CPUUniCore32State *env; ObjectClass *oc; - static int inited = 1; oc = cpu_class_by_name(TYPE_UNICORE32_CPU, cpu_model); if (oc == NULL) { @@ -40,11 +39,6 @@ CPUUniCore32State *uc32_cpu_init(const char *cpu_model) env = &cpu->env; env->cpu_model_str = cpu_model; - if (inited) { - inited = 0; - uc32_translate_init(); - } - object_property_set_bool(OBJECT(cpu), true, "realized", NULL); return env; |