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/translate.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/translate.c')
| -rw-r--r-- | target-cris/translate.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/target-cris/translate.c b/target-cris/translate.c index 25ff490399..25a43faf35 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3550,8 +3550,6 @@ CRISCPU *cpu_cris_init(const char *cpu_model) { CRISCPU *cpu; CPUCRISState *env; - static int tcg_initialized = 0; - int i; cpu = CRIS_CPU(object_new(TYPE_CRIS_CPU)); env = &cpu->env; @@ -3560,21 +3558,16 @@ CRISCPU *cpu_cris_init(const char *cpu_model) object_property_set_bool(OBJECT(cpu), true, "realized", NULL); - if (tcg_initialized) { - return cpu; - } + return cpu; +} - tcg_initialized = 1; +void cris_initialize_tcg(void) +{ + int i; #define GEN_HELPER 2 #include "helper.h" - if (env->pregs[PR_VR] < 32) { - cpu_crisv10_init(env); - return cpu; - } - - cpu_env = tcg_global_reg_new_ptr(TCG_AREG0, "env"); cc_x = tcg_global_mem_new(TCG_AREG0, offsetof(CPUCRISState, cc_x), "cc_x"); @@ -3614,8 +3607,6 @@ CRISCPU *cpu_cris_init(const char *cpu_model) offsetof(CPUCRISState, pregs[i]), pregnames[i]); } - - return cpu; } void restore_state_to_opc(CPUCRISState *env, TranslationBlock *tb, int pc_pos) |