[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/13] target-sh4: Start QOM'ifying CPU init
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v2 03/13] target-sh4: Start QOM'ifying CPU init |
Date: |
Fri, 13 Apr 2012 23:30:08 +0200 |
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 062d737..948cfac 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
- [Qemu-devel] [PATCH v2 00/13] QOM'ify SuperH CPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 05/13] hw/sh7750: Use SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 06/13] target-sh4: Make cpu_sh4_invalidate_tlb() take SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 07/13] target-sh4: Make increment_urc() take SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 10/13] target-sh4: Make get_{physical, mmu}_address() take SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 02/13] target-sh4: QOM'ify CPU reset, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 03/13] target-sh4: Start QOM'ifying CPU init,
Andreas Färber <=
- [Qemu-devel] [PATCH v2 08/13] target-sh4: Make find_*tlb_entry() take SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 04/13] target-sh4: Do not reset CPU feature flags on reset, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 11/13] target-sh4: Make copy_utlb_entry_itlb() take SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 01/13] target-sh4: QOM'ify CPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 12/13] target-sh4: Make update_itlb_use() take SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 13/13] target-sh4: Make itlb_replacement() use SuperHCPU, Andreas Färber, 2012/04/13
- [Qemu-devel] [PATCH v2 09/13] target-sh4: Make cpu_sh4_{read, write}_mmaped_{i, u}tlb_addr() take CPU, Andreas Färber, 2012/04/13