commit 1b1a38b0aaf3a24b9b8162d8aef9e700a42f8d43
author edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> Mon Jun 09 23:18:06 2008 +0000
committer edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162> Mon Jun 09 23:18:06 2008 +0000
tree 1492c8dbf290afdd5fe16fb1437729671ef287ec
parent 5bf8f1aba1ab727713edf4084e7bc841dd1e6732

CRIS: Emulate NMIs.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4719 c046a42c-6fe2-441c-8c8c-71466251a162

cpu-exec.c

diff --git a/cpu-exec.c b/cpu-exec.c
index 3a1ff4e..b8c208b 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -501,7 +501,15 @@
                         next_tb = 0;
                     }
 #elif defined(TARGET_CRIS)
-                    if (interrupt_request & CPU_INTERRUPT_HARD) {
+                    if (interrupt_request & CPU_INTERRUPT_HARD
+                        && (env->pregs[PR_CCS] & I_FLAG)) {
+                        env->exception_index = EXCP_IRQ;
+                        do_interrupt(env);
+                        next_tb = 0;
+                    }
+                    if (interrupt_request & CPU_INTERRUPT_NMI
+                        && (env->pregs[PR_CCS] & M_FLAG)) {
+                        env->exception_index = EXCP_NMI;
                         do_interrupt(env);
                         next_tb = 0;
                     }