target-m68k: Start QOM'ifying CPU init

[qemu.git] / target-m68k / helper.c

diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index e91acdbf0d400ce4133a0b9f1fdbea84f4aafa0f..e850d53d409d4cf483d1d7efb10b025b8dcf4433 100644 (file)
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -145,21 +145,7 @@ static int cpu_m68k_set_model(CPUM68KState *env, const char *name)
 
 void cpu_state_reset(CPUM68KState *env)
 {
-    if (qemu_loglevel_mask(CPU_LOG_RESET)) {
-        qemu_log("CPU Reset (CPU %d)\n", env->cpu_index);
-        log_cpu_state(env, 0);
-    }
-
-    memset(env, 0, offsetof(CPUM68KState, breakpoints));
-#if !defined (CONFIG_USER_ONLY)
-    env->sr = 0x2700;
-#endif
-    m68k_switch_sp(env);
-    /* ??? FP regs should be initialized to NaN.  */
-    env->cc_op = CC_OP_FLAGS;
-    /* TODO: We should set PC from the interrupt vector.  */
-    env->pc = 0;
-    tlb_flush(env, 1);
+    cpu_reset(ENV_GET_CPU(env));
 }
 
 CPUM68KState *cpu_m68k_init(const char *cpu_model)
@@ -170,7 +156,7 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model)
 
     cpu = M68K_CPU(object_new(TYPE_M68K_CPU));
     env = &cpu->env;
-    cpu_exec_init(env);
+
     if (!inited) {
         inited = 1;
         m68k_tcg_init();
@@ -183,7 +169,7 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model)
         return NULL;
     }
 
-    cpu_state_reset(env);
+    cpu_reset(ENV_GET_CPU(env));
     qemu_init_vcpu(env);
     return env;
 }