Skip to content

Commit

Permalink
target-lm32: Introduce QOM realizefn for LM32CPU
Browse files Browse the repository at this point in the history
Introduce a realizefn and set realized = true in cpu_lm32_init().

Also move cpu_reset() call from initfn to realizefn.

Signed-off-by: Andreas Färber <afaerber@suse.de>
  • Loading branch information
afaerber committed Feb 1, 2013
1 parent 373b0ad commit 8b800e8
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
2 changes: 2 additions & 0 deletions target-lm32/cpu-qom.h
Expand Up @@ -34,6 +34,7 @@

/**
* LM32CPUClass:
* @parent_realize: The parent class' realize handler.
* @parent_reset: The parent class' reset handler.
*
* A LatticeMico32 CPU model.
Expand All @@ -43,6 +44,7 @@ typedef struct LM32CPUClass {
CPUClass parent_class;
/*< public >*/

DeviceRealize parent_realize;
void (*parent_reset)(CPUState *cpu);
} LM32CPUClass;

Expand Down
18 changes: 16 additions & 2 deletions target-lm32/cpu.c
Expand Up @@ -42,6 +42,18 @@ static void lm32_cpu_reset(CPUState *s)
memset(env, 0, offsetof(CPULM32State, breakpoints));
}

static void lm32_cpu_realizefn(DeviceState *dev, Error **errp)
{
LM32CPU *cpu = LM32_CPU(dev);
LM32CPUClass *lcc = LM32_CPU_GET_CLASS(dev);

cpu_reset(CPU(cpu));

qemu_init_vcpu(&cpu->env);

lcc->parent_realize(dev, errp);
}

static void lm32_cpu_initfn(Object *obj)
{
LM32CPU *cpu = LM32_CPU(obj);
Expand All @@ -50,14 +62,16 @@ static void lm32_cpu_initfn(Object *obj)
cpu_exec_init(env);

env->flags = 0;

cpu_reset(CPU(cpu));
}

static void lm32_cpu_class_init(ObjectClass *oc, void *data)
{
LM32CPUClass *lcc = LM32_CPU_CLASS(oc);
CPUClass *cc = CPU_CLASS(oc);
DeviceClass *dc = DEVICE_CLASS(oc);

lcc->parent_realize = dc->realize;
dc->realize = lm32_cpu_realizefn;

lcc->parent_reset = cc->reset;
cc->reset = lm32_cpu_reset;
Expand Down
4 changes: 2 additions & 2 deletions target-lm32/helper.c
Expand Up @@ -212,13 +212,13 @@ LM32CPU *cpu_lm32_init(const char *cpu_model)
env->num_wps = def->num_watchpoints;
env->cfg = cfg_by_def(def);

qemu_init_vcpu(env);

if (tcg_enabled() && !tcg_initialized) {
tcg_initialized = 1;
lm32_translate_init();
}

object_property_set_bool(OBJECT(cpu), true, "realized", NULL);

return cpu;
}

Expand Down

0 comments on commit 8b800e8

Please sign in to comment.