summaryrefslogtreecommitdiff
path: root/cpu-exec.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2006-09-20 20:30:57 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2006-09-20 20:30:57 +0000
commitdf52b0009bcd7cb10e52f37cb669c3b46a4b36b0 (patch)
tree06cec27d78833d22b08cf16b4c1793d741500e51 /cpu-exec.c
parent8f40c388ef0b1ce79c08d20b2a4b2a4a4f56a6f0 (diff)
downloadqemu-df52b0009bcd7cb10e52f37cb669c3b46a4b36b0.tar.gz
sun4m halt support (Blue Swirl)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2161 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'cpu-exec.c')
-rw-r--r--cpu-exec.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpu-exec.c b/cpu-exec.c
index eeeeb8f5db..6385639f46 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -548,8 +548,10 @@ int cpu_exec(CPUState *env1)
//do_interrupt(0, 0, 0, 0, 0);
env->interrupt_request &= ~CPU_INTERRUPT_TIMER;
} else if (interrupt_request & CPU_INTERRUPT_HALT) {
- env1->halted = 1;
- return EXCP_HALTED;
+ env->interrupt_request &= ~CPU_INTERRUPT_HALT;
+ env->halted = 1;
+ env->exception_index = EXCP_HLT;
+ cpu_loop_exit();
}
#elif defined(TARGET_ARM)
if (interrupt_request & CPU_INTERRUPT_FIQ