Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
target-m68k: Move TCG initialization to M68kCPU initfn
Add a tcg_enabled() check to suppress it for qtest.

Signed-off-by: Andreas Färber <afaerber@suse.de>
  • Loading branch information
afaerber committed Feb 16, 2013
1 parent 868e282 commit 1cc8961
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
6 changes: 6 additions & 0 deletions target-m68k/cpu.c
Expand Up @@ -156,8 +156,14 @@ static void m68k_cpu_initfn(Object *obj)
{
M68kCPU *cpu = M68K_CPU(obj);
CPUM68KState *env = &cpu->env;
static bool inited;

cpu_exec_init(env);

if (tcg_enabled() && !inited) {
inited = true;
m68k_tcg_init();
}
}

static const VMStateDescription vmstate_m68k_cpu = {
Expand Down
7 changes: 0 additions & 7 deletions target-m68k/helper.c
Expand Up @@ -103,20 +103,13 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model)
M68kCPU *cpu;
CPUM68KState *env;
ObjectClass *oc;
static int inited;

oc = cpu_class_by_name(TYPE_M68K_CPU, cpu_model);
if (oc == NULL) {
return NULL;
}
cpu = M68K_CPU(object_new(object_class_get_name(oc)));
env = &cpu->env;

if (!inited) {
inited = 1;
m68k_tcg_init();
}

env->cpu_model_str = cpu_model;

register_m68k_insns(env);
Expand Down

0 comments on commit 1cc8961

Please sign in to comment.