commit 24c7b0e330fdbfcfe87f515d79e67156c57cbc4f
author ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Fri Mar 30 16:44:54 2007 +0000
committer ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> Fri Mar 30 16:44:54 2007 +0000
tree 50ed71bd4fc4c3fc0e6fc5cccb222417244b5baa
parent e69f67b6d58f366ffaa83a0973948edd1f74b370

Sanitize mips exception handling.


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

cpu-exec.c

diff --git a/cpu-exec.c b/cpu-exec.c
index d124c40..d168886 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -461,10 +461,10 @@
                     }
 #elif defined(TARGET_MIPS)
                     if ((interrupt_request & CPU_INTERRUPT_HARD) &&
+                        (env->CP0_Status & env->CP0_Cause & CP0Ca_IP_mask) &&
                         (env->CP0_Status & (1 << CP0St_IE)) &&
-                        (env->CP0_Status & env->CP0_Cause & 0x0000FF00) &&
-                        !(env->hflags & MIPS_HFLAG_EXL) &&
-                        !(env->hflags & MIPS_HFLAG_ERL) &&
+                        !(env->CP0_Status & (1 << CP0St_EXL)) &&
+                        !(env->CP0_Status & (1 << CP0St_ERL)) &&
                         !(env->hflags & MIPS_HFLAG_DM)) {
                         /* Raise it */
                         env->exception_index = EXCP_EXT_INTERRUPT;