[Qemu-devel] [PATCH v3 03/13] target-sh4: Start QOM'ifying CPU init

[Andreas Färber]

Move code from cpu_sh4_init() into a QOM initfn.

Signed-off-by: Andreas Färber <address@hidden>
---
 target-sh4/cpu.c       |   13 +++++++++++++
 target-sh4/translate.c |    3 ---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c
index 84d4672..5dab9ea 100644
--- a/target-sh4/cpu.c
+++ b/target-sh4/cpu.c
@@ -53,6 +53,18 @@ static void superh_cpu_reset(CPUState *s)
     set_default_nan_mode(1, &env->fp_status);
 }
 
+static void superh_cpu_initfn(Object *obj)
+{
+    SuperHCPU *cpu = SUPERH_CPU(obj);
+    CPUSH4State *env = &cpu->env;
+
+    cpu_exec_init(env);
+
+    env->movcal_backup_tail = &(env->movcal_backup);
+
+    cpu_reset(CPU(cpu));
+}
+
 static void superh_cpu_class_init(ObjectClass *oc, void *data)
 {
     CPUClass *cc = CPU_CLASS(oc);
@@ -66,6 +78,7 @@ static const TypeInfo superh_cpu_type_info = {
     .name = TYPE_SUPERH_CPU,
     .parent = TYPE_CPU,
     .instance_size = sizeof(SuperHCPU),
+    .instance_init = superh_cpu_initfn,
     .abstract = false,
     .class_size = sizeof(SuperHCPUClass),
     .class_init = superh_cpu_class_init,
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index d0568e2..b7426f1 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -259,11 +259,8 @@ CPUSH4State *cpu_sh4_init(const char *cpu_model)
     cpu = SUPERH_CPU(object_new(TYPE_SUPERH_CPU));
     env = &cpu->env;
     env->features = def->features;
-    cpu_exec_init(env);
-    env->movcal_backup_tail = &(env->movcal_backup);
     sh4_translate_init();
     env->cpu_model_str = cpu_model;
-    cpu_reset(CPU(cpu));
     cpu_register(env, def);
     qemu_init_vcpu(env);
     return env;
-- 
1.7.7