cpu: Factor out cpu_generic_init()

[qemu.git] / target-sh4 / cpu.c

diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c
index 03dedc179ef62e05558765cc7fa8130b16dbacbc..8e7bcd248deb819d27a5f7638b278390f9930ecd 100644 (file)
--- a/target-sh4/cpu.c
+++ b/target-sh4/cpu.c
@@ -39,6 +39,11 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb)
     cpu->env.flags = tb->flags;
 }
 
     cpu->env.flags = tb->flags;
 }
 

+static bool superh_cpu_has_work(CPUState *cs)
+{
+    return cs->interrupt_request & CPU_INTERRUPT_HARD;
+}
+

 /* CPUClass::reset() */
 static void superh_cpu_reset(CPUState *s)
 {
 /* CPUClass::reset() */
 static void superh_cpu_reset(CPUState *s)
 {


@@ -143,21 +148,7 @@ static ObjectClass *superh_cpu_class_by_name(const char *cpu_model)
 
 SuperHCPU *cpu_sh4_init(const char *cpu_model)
 {
 
 SuperHCPU *cpu_sh4_init(const char *cpu_model)
 {

-    SuperHCPU *cpu;
-    CPUSH4State *env;
-    ObjectClass *oc;
-
-    oc = superh_cpu_class_by_name(cpu_model);
-    if (oc == NULL) {
-        return NULL;
-    }
-    cpu = SUPERH_CPU(object_new(object_class_get_name(oc)));
-    env = &cpu->env;
-    env->cpu_model_str = cpu_model;
-
-    object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
-
-    return cpu;
+    return SUPERH_CPU(cpu_generic_init(TYPE_SUPERH_CPU, cpu_model));

 }
 
 static void sh7750r_cpu_initfn(Object *obj)
 }
 
 static void sh7750r_cpu_initfn(Object *obj)


@@ -240,10 +231,11 @@ static const TypeInfo sh7785_type_info = {
 
 static void superh_cpu_realizefn(DeviceState *dev, Error **errp)
 {
 
 static void superh_cpu_realizefn(DeviceState *dev, Error **errp)
 {

-    SuperHCPU *cpu = SUPERH_CPU(dev);
+    CPUState *cs = CPU(dev);

     SuperHCPUClass *scc = SUPERH_CPU_GET_CLASS(dev);
 
     SuperHCPUClass *scc = SUPERH_CPU_GET_CLASS(dev);
 

-    cpu_reset(CPU(cpu));
+    cpu_reset(cs);
+    qemu_init_vcpu(cs);

 
     scc->parent_realize(dev, errp);
 }
 
     scc->parent_realize(dev, errp);
 }


@@ -282,11 +274,18 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data)
     cc->reset = superh_cpu_reset;
 
     cc->class_by_name = superh_cpu_class_by_name;
     cc->reset = superh_cpu_reset;
 
     cc->class_by_name = superh_cpu_class_by_name;

+    cc->has_work = superh_cpu_has_work;

     cc->do_interrupt = superh_cpu_do_interrupt;
     cc->dump_state = superh_cpu_dump_state;
     cc->set_pc = superh_cpu_set_pc;
     cc->synchronize_from_tb = superh_cpu_synchronize_from_tb;
     cc->do_interrupt = superh_cpu_do_interrupt;
     cc->dump_state = superh_cpu_dump_state;
     cc->set_pc = superh_cpu_set_pc;
     cc->synchronize_from_tb = superh_cpu_synchronize_from_tb;

+    cc->gdb_read_register = superh_cpu_gdb_read_register;
+    cc->gdb_write_register = superh_cpu_gdb_write_register;
+#ifndef CONFIG_USER_ONLY
+    cc->get_phys_page_debug = superh_cpu_get_phys_page_debug;
+#endif

     dc->vmsd = &vmstate_sh_cpu;
     dc->vmsd = &vmstate_sh_cpu;

+    cc->gdb_num_core_regs = 59;

 }
 
 static const TypeInfo superh_cpu_type_info = {
 }
 
 static const TypeInfo superh_cpu_type_info = {