aboutsummaryrefslogtreecommitdiff
path: root/cpu-exec.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-11-26 10:46:39 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-11-26 10:46:39 +0000
commit9332f9dafa33b085488a5369333213d549dbdc7f (patch)
tree4f1cfad1613e5ccfd798a7406ead9601310e8f41 /cpu-exec.c
parente8ebb8a8d7d10bd04eab9ae8ad3da707d178a02d (diff)
downloadqemu-9332f9dafa33b085488a5369333213d549dbdc7f.zip
qemu-9332f9dafa33b085488a5369333213d549dbdc7f.tar.gz
qemu-9332f9dafa33b085488a5369333213d549dbdc7f.tar.bz2
ARM CPU suspend/halt (Paul Brook)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1663 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'cpu-exec.c')
-rw-r--r--cpu-exec.c11
1 files changed, 11 insertions, 0 deletions
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 @@ int cpu_exec(CPUState *env1)
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;