aboutsummaryrefslogtreecommitdiff
path: root/target-cris
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-03 06:43:49 +0200
committerAndreas Färber <afaerber@suse.de>2012-10-31 04:11:37 +0100
commit3993c6bddf6da21977349ba1b14b86294ef4f7ff (patch)
treee740fcf1f22bb180556c97e172ec7f30d41d7f3a /target-cris
parentb13ce26d3e8c6682044ae84920f2417b30ce356b (diff)
cpus: Pass CPUState to [qemu_]cpu_has_work()
For target-mips also change the return type to bool. Make include paths for cpu-qom.h consistent for alpha and unicore32. Signed-off-by: Andreas Färber <afaerber@suse.de> [AF: Updated new target-openrisc function accordingly] Acked-by: Richard Henderson <rth@twiddle.net> (for alpha)
Diffstat (limited to 'target-cris')
-rw-r--r--target-cris/cpu.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index 4f4df6d9b5..2c27506d0d 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -285,8 +285,10 @@ static inline void cpu_get_tb_cpu_state(CPUCRISState *env, target_ulong *pc,
#define cpu_list cris_cpu_list
void cris_cpu_list(FILE *f, fprintf_function cpu_fprintf);
-static inline bool cpu_has_work(CPUCRISState *env)
+static inline bool cpu_has_work(CPUState *cpu)
{
+ CPUCRISState *env = &CRIS_CPU(cpu)->env;
+
return env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI);
}