soft irq are just irqs (Ralf Baechle)

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

diff --git a/cpu-exec.c b/cpu-exec.c
index 20cb0df62e0f072dfa37d10632f91bec905917ba..c7cd6078878ec3de34612111ee3ac1f6227e9301 100644 (file)
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -307,7 +307,7 @@ int cpu_exec(CPUState *env1)
 #elif defined(TARGET_MIPS)
                     if ((interrupt_request & CPU_INTERRUPT_HARD) &&
                         (env->CP0_Status & (1 << CP0St_IE)) &&
-                        (env->CP0_Cause & 0x0000FC00) &&
+                        (env->CP0_Cause & 0x0000FF00) &&
                         !(env->hflags & MIPS_HFLAG_EXL) &&
                         !(env->hflags & MIPS_HFLAG_ERL) &&
                         !(env->hflags & MIPS_HFLAG_DM)) {

diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index dc1040786e4a41908907be5305b393fa38f37ac3..854abea0c7cb51a6e9654cd5260b0270282cad3f 100644 (file)
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -352,7 +352,7 @@ void do_mtc0 (int reg, int sel)
         old = env->CP0_Status;
         env->CP0_Status = val;
         /* If we unmasked an asserted IRQ, raise it */
-        mask = 0x0000FC00;
+        mask = 0x0000FF00;
         if (loglevel & CPU_LOG_TB_IN_ASM) {
             fprintf(logfile, "Status %08x => %08x Cause %08x (%08x %08x %08x)\n",
                     old, val, env->CP0_Cause, old & mask, val & mask,