summaryrefslogtreecommitdiff
path: root/target-m68k
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-m68k
parentb13ce26d3e8c6682044ae84920f2417b30ce356b (diff)
downloadqemu-3993c6bddf6da21977349ba1b14b86294ef4f7ff.zip
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-m68k')
-rw-r--r--target-m68k/cpu.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index 5e6ee50969..780e2c94e7 100644
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -257,8 +257,10 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, target_ulong *pc,
| ((env->macsr >> 4) & 0xf); /* Bits 0-3 */
}
-static inline bool cpu_has_work(CPUM68KState *env)
+static inline bool cpu_has_work(CPUState *cpu)
{
+ CPUM68KState *env = &M68K_CPU(cpu)->env;
+
return env->interrupt_request & CPU_INTERRUPT_HARD;
}