瀏覽代碼

target-cris: Start QOM'ifying CPU init

Move VR-independent code from cpu_cris_init() into an initfn.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Andreas Färber 13 年之前
父節點
當前提交
aa0d1267b3
共有 2 個文件被更改,包括 10 次插入1 次删除
  1. 9 0
      target-cris/cpu.c
  2. 1 1
      target-cris/translate.c

+ 9 - 0
target-cris/cpu.c

@@ -55,6 +55,14 @@ static void cris_cpu_reset(CPUState *s)
 #endif
 }
 
+static void cris_cpu_initfn(Object *obj)
+{
+    CRISCPU *cpu = CRIS_CPU(obj);
+    CPUCRISState *env = &cpu->env;
+
+    cpu_exec_init(env);
+}
+
 static void cris_cpu_class_init(ObjectClass *oc, void *data)
 {
     CPUClass *cc = CPU_CLASS(oc);
@@ -68,6 +76,7 @@ static const TypeInfo cris_cpu_type_info = {
     .name = TYPE_CRIS_CPU,
     .parent = TYPE_CPU,
     .instance_size = sizeof(CRISCPU),
+    .instance_init = cris_cpu_initfn,
     .abstract = false,
     .class_size = sizeof(CRISCPUClass),
     .class_init = cris_cpu_class_init,

+ 1 - 1
target-cris/translate.c

@@ -3514,7 +3514,7 @@ CPUCRISState *cpu_cris_init (const char *cpu_model)
     env = &cpu->env;
 
 	env->pregs[PR_VR] = vr_by_name(cpu_model);
-	cpu_exec_init(env);
+
     cpu_reset(CPU(cpu));
 	qemu_init_vcpu(env);