aboutsummaryrefslogtreecommitdiff
path: root/target-cris/translate.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-05 11:37:07 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:42 +0200
commit9fca5636e1883346418d437320f43b0c34cb6cc1 (patch)
tree4fd2f6d463a7784870a1633046b1680b883127f9 /target-cris/translate.c
parentdd10ce6d8a437b8c5d2ce9c193a3b64080038c43 (diff)
target-cris: Let cpu_cris_init() return CRISCPU
Turn cpu_init macro into a static inline function returning CPUCRISState for backwards compatibility. Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Diffstat (limited to 'target-cris/translate.c')
-rw-r--r--target-cris/translate.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/target-cris/translate.c b/target-cris/translate.c
index a398057661..eed03d3d86 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -3503,7 +3503,7 @@ static uint32_t vr_by_name(const char *name)
return 32;
}
-CPUCRISState *cpu_cris_init (const char *cpu_model)
+CRISCPU *cpu_cris_init(const char *cpu_model)
{
CRISCPU *cpu;
CPUCRISState *env;
@@ -3519,7 +3519,7 @@ CPUCRISState *cpu_cris_init (const char *cpu_model)
qemu_init_vcpu(env);
if (tcg_initialized) {
- return env;
+ return cpu;
}
tcg_initialized = 1;
@@ -3529,7 +3529,7 @@ CPUCRISState *cpu_cris_init (const char *cpu_model)
if (env->pregs[PR_VR] < 32) {
cpu_crisv10_init(env);
- return env;
+ return cpu;
}
@@ -3573,7 +3573,7 @@ CPUCRISState *cpu_cris_init (const char *cpu_model)
pregnames[i]);
}
- return env;
+ return cpu;
}
void cpu_state_reset(CPUCRISState *env)