OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target-sh4: Introduce QOM realizefn for SuperHCPU 

Introduce a realizefn and set realized = true in cpu_sh4_init().

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2012-04-23 18:16:02 +02:00
parent 1f1366322b
commit 55acb588dd
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-sh4/cpu-qom.h
View File

@ -33,6 +33,7 @@
/** /**
* SuperHCPUClass: * SuperHCPUClass:
* @parent_realize: The parent class' realize handler.
* @parent_reset: The parent class' reset handler. * @parent_reset: The parent class' reset handler.
* *
* A SuperH CPU model. * A SuperH CPU model.
@ -42,6 +43,7 @@ typedef struct SuperHCPUClass {
CPUClass parent_class; CPUClass parent_class;
/*< public >*/ /*< public >*/
DeviceRealize parent_realize;
void (*parent_reset)(CPUState *cpu); void (*parent_reset)(CPUState *cpu);
} SuperHCPUClass; } SuperHCPUClass;

14
target-sh4/cpu.c
View File

@ -54,6 +54,17 @@ static void superh_cpu_reset(CPUState *s)
set_default_nan_mode(1, &env->fp_status); set_default_nan_mode(1, &env->fp_status);
} }
static void superh_cpu_realizefn(DeviceState *dev, Error **errp)
{
SuperHCPU *cpu = SUPERH_CPU(dev);
SuperHCPUClass *scc = SUPERH_CPU_GET_CLASS(dev);
cpu_reset(CPU(cpu));
qemu_init_vcpu(&cpu->env);
scc->parent_realize(dev, errp);
}
static void superh_cpu_initfn(Object *obj) static void superh_cpu_initfn(Object *obj)
{ {
SuperHCPU *cpu = SUPERH_CPU(obj); SuperHCPU *cpu = SUPERH_CPU(obj);
@ -75,6 +86,9 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data)
CPUClass *cc = CPU_CLASS(oc); CPUClass *cc = CPU_CLASS(oc);
SuperHCPUClass *scc = SUPERH_CPU_CLASS(oc); SuperHCPUClass *scc = SUPERH_CPU_CLASS(oc);
scc->parent_realize = dc->realize;
dc->realize = superh_cpu_realizefn;
scc->parent_reset = cc->reset; scc->parent_reset = cc->reset;
cc->reset = superh_cpu_reset; cc->reset = superh_cpu_reset;

5
target-sh4/translate.c
View File

@ -253,9 +253,10 @@ SuperHCPU *cpu_sh4_init(const char *cpu_model)
env->features = def->features; env->features = def->features;
sh4_translate_init(); sh4_translate_init();
env->cpu_model_str = cpu_model; env->cpu_model_str = cpu_model;
cpu_reset(CPU(cpu));
cpu_register(env, def); cpu_register(env, def);
qemu_init_vcpu(env);
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
return cpu; return cpu;
} }