commit 9332f9dafa33b085488a5369333213d549dbdc7f
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Nov 26 10:46:39 2005 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Sat Nov 26 10:46:39 2005 +0000
tree 4f1cfad1613e5ccfd798a7406ead9601310e8f41
parent e8ebb8a8d7d10bd04eab9ae8ad3da707d178a02d

ARM CPU suspend/halt (Paul Brook)


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

cpu-exec.c

diff --git a/cpu-exec.c b/cpu-exec.c
index f411ecc..cddea53 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -274,6 +274,17 @@
             return EXCP_HALTED;
         }
     }
+#elif defined(TARGET_ARM)
+    if (env1->halted) {
+        /* An interrupt wakes the CPU even if the I and F CPSR bits are
+           set.  */
+        if (env1->interrupt_request
+            & (CPU_INTERRUPT_FIQ | CPU_INTERRUPT_HARD)) {
+            env1->halted = 0;
+        } else {
+            return EXCP_HALTED;
+        }
+    }
 #endif
 
     cpu_single_env = env1;