From 69b5cae1c08dce6084d85bb407664c51920d0750 Mon Sep 17 00:00:00 2001 From: edgar_igl Date: Wed, 7 Jan 2009 12:36:06 +0000 Subject: [PATCH] CRIS: NMI wakes up the core. Signed-off-by: Edgar E. Iglesias git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6201 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-cris/exec.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target-cris/exec.h b/target-cris/exec.h index d328bf6..cce87f6 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; } -- 1.7.9.5