aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target-cris/exec.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/target-cris/exec.h b/target-cris/exec.h
index d328bf60ab..cce87f6a08 100644
--- a/target-cris/exec.h
+++ b/target-cris/exec.h
@@ -46,7 +46,10 @@ void helper_movec(CPUCRISState *env, int reg, uint32_t val);
static inline int cpu_halted(CPUState *env) {
if (!env->halted)
return 0;
- if (env->interrupt_request & CPU_INTERRUPT_HARD) {
+
+ /* IRQ, NMI and GURU execeptions wakes us up. */
+ if (env->interrupt_request
+ & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) {
env->halted = 0;
return 0;
}