aboutsummaryrefslogtreecommitdiff
path: root/target-arm/exec.h
diff options
context:
space:
mode:
Diffstat (limited to 'target-arm/exec.h')
-rw-r--r--target-arm/exec.h9
1 files changed, 7 insertions, 2 deletions
diff --git a/target-arm/exec.h b/target-arm/exec.h
index 3e4083a61b..710a2f9882 100644
--- a/target-arm/exec.h
+++ b/target-arm/exec.h
@@ -37,14 +37,19 @@ static inline void regs_to_env(void)
{
}
+static inline int cpu_has_work(CPUState *env)
+{
+ return (env->interrupt_request &
+ (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB));
+}
+
static inline int cpu_halted(CPUState *env) {
if (!env->halted)
return 0;
/* An interrupt wakes the CPU even if the I and F CPSR bits are
set. We use EXITTB to silently wake CPU without causing an
actual interrupt. */
- if (env->interrupt_request &
- (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB)) {
+ if (cpu_has_work(env)) {
env->halted = 0;
return 0;
}