mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

target-lm32: QOM'ify CPU init

Browse Source 
Move code from cpu_lm32_init() to an initfn; call cpu_reset()
instead of cpu_state_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Michael Walle <michael@walle.cc>
This commit is contained in:
Andreas Färber 2012-04-11 01:33:33 +02:00
parent fc0ced2fbd
commit 8d7d505add
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
target-lm32/cpu.c
View File

@ -34,6 +34,18 @@ static void lm32_cpu_reset(CPUState *s)
cpu_state_reset(env); cpu_state_reset(env);
} }
static void lm32_cpu_initfn(Object *obj)
{
LM32CPU *cpu = LM32_CPU(obj);
CPULM32State *env = &cpu->env;
cpu_exec_init(env);
env->flags = 0;
cpu_reset(CPU(cpu));
}
static void lm32_cpu_class_init(ObjectClass *oc, void *data) static void lm32_cpu_class_init(ObjectClass *oc, void *data)
{ {
LM32CPUClass *lcc = LM32_CPU_CLASS(oc); LM32CPUClass *lcc = LM32_CPU_CLASS(oc);
@ -47,6 +59,7 @@ static const TypeInfo lm32_cpu_type_info = {
.name = TYPE_LM32_CPU, .name = TYPE_LM32_CPU,
.parent = TYPE_CPU, .parent = TYPE_CPU,
.instance_size = sizeof(LM32CPU), .instance_size = sizeof(LM32CPU),
.instance_init = lm32_cpu_initfn,
.abstract = false, .abstract = false,
.class_size = sizeof(LM32CPUClass), .class_size = sizeof(LM32CPUClass),
.class_init = lm32_cpu_class_init, .class_init = lm32_cpu_class_init,

3
target-lm32/helper.c
View File

@ -211,10 +211,7 @@ CPULM32State *cpu_lm32_init(const char *cpu_model)
env->num_bps = def->num_breakpoints; env->num_bps = def->num_breakpoints;
env->num_wps = def->num_watchpoints; env->num_wps = def->num_watchpoints;
env->cfg = cfg_by_def(def); env->cfg = cfg_by_def(def);
env->flags = 0;
cpu_exec_init(env);
cpu_state_reset(env);
qemu_init_vcpu(env); qemu_init_vcpu(env);
if (tcg_enabled() && !tcg_initialized) { if (tcg_enabled() && !tcg_initialized) {