diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-19 23:55:42 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-02-16 14:50:58 +0100 |
| commit | d1a94fec3d8d70009fd5ac27ade5539fe58cd702 (patch) | |
| tree | 1e2254e77b37ba4ae7f53b682a1172e5920e3a91 /target-cris/cpu.c | |
| parent | 79614b781df5096ffecf531992314781dbab54af (diff) | |
target-cris: Move TCG initialization to CRISCPU initfn
Split out TCG initialization from cpu_cris_init(). Avoid CPUCRISState
dependency for v10-specific initialization and for non-v10 by inlining
the decision into the initfn as well.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-cris/cpu.c')
| -rw-r--r-- | target-cris/cpu.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/target-cris/cpu.c b/target-cris/cpu.c index 34c4f75a44..fedf64191d 100644 --- a/target-cris/cpu.c +++ b/target-cris/cpu.c @@ -70,8 +70,18 @@ static void cris_cpu_initfn(Object *obj) { CRISCPU *cpu = CRIS_CPU(obj); CPUCRISState *env = &cpu->env; + static bool tcg_initialized; cpu_exec_init(env); + + if (tcg_enabled() && !tcg_initialized) { + tcg_initialized = true; + if (env->pregs[PR_VR] < 32) { + cris_initialize_crisv10_tcg(); + } else { + cris_initialize_tcg(); + } + } } static void cris_cpu_class_init(ObjectClass *oc, void *data) |