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

target-xtensa: Start QOM'ifying CPU init 

Move XtensaConfig-independent code from cpu_xtensa_init() into a
QOM initfn, as a start.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
Andreas Färber 2012-04-11 18:24:50 +02:00 committed by Max Filippov
parent 5087a72cb3
commit e554bbc689
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target-xtensa/cpu.c
View File

@ -53,6 +53,14 @@ static void xtensa_cpu_reset(CPUState *s)
reset_mmu(env);
}
static void xtensa_cpu_initfn(Object *obj)
{
XtensaCPU *cpu = XTENSA_CPU(obj);
CPUXtensaState *env = &cpu->env;
cpu_exec_init(env);
}
static void xtensa_cpu_class_init(ObjectClass *oc, void *data)
{
CPUClass *cc = CPU_CLASS(oc);
@ -66,6 +74,7 @@ static const TypeInfo xtensa_cpu_type_info = {
.name = TYPE_XTENSA_CPU,
.parent = TYPE_CPU,
.instance_size = sizeof(XtensaCPU),
.instance_init = xtensa_cpu_initfn,
.abstract = false,
.class_size = sizeof(XtensaCPUClass),
.class_init = xtensa_cpu_class_init,

1
target-xtensa/helper.c
View File

@ -102,7 +102,6 @@ CPUXtensaState *cpu_xtensa_init(const char *cpu_model)
cpu = XTENSA_CPU(object_new(TYPE_XTENSA_CPU));
env = &cpu->env;
env->config = config;
cpu_exec_init(env);
if (!tcg_inited) {
tcg_inited = 1;