ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Färber 2012-04-11 23:41:06 +02:00 committed by Edgar E. Iglesias
parent 1c3b52fb1a
commit aa0d1267b3
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target-cris/cpu.c
View File

@ -55,6 +55,14 @@ static void cris_cpu_reset(CPUState *s)
#endif #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) static void cris_cpu_class_init(ObjectClass *oc, void *data)
{ {
CPUClass *cc = CPU_CLASS(oc); CPUClass *cc = CPU_CLASS(oc);
@ -68,6 +76,7 @@ static const TypeInfo cris_cpu_type_info = {
.name = TYPE_CRIS_CPU, .name = TYPE_CRIS_CPU,
.parent = TYPE_CPU, .parent = TYPE_CPU,
.instance_size = sizeof(CRISCPU), .instance_size = sizeof(CRISCPU),
.instance_init = cris_cpu_initfn,
.abstract = false, .abstract = false,
.class_size = sizeof(CRISCPUClass), .class_size = sizeof(CRISCPUClass),
.class_init = cris_cpu_class_init, .class_init = cris_cpu_class_init,

2
target-cris/translate.c
View File

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