CRIS: NMI wakes up the core.

Signed-off-by: Edgar E. Iglesias <[email protected]>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6201 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/target-cris/exec.h b/target-cris/exec.h
index d328bf60abb84466043b1c532b3c88911f15e80b..cce87f6a08ea4856b095d2e598f98fa88a8715ca 100644 (file)
--- 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;
        }