diff options
| author | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-07-02 15:16:15 +0000 |
|---|---|---|
| committer | bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> | 2005-07-02 15:16:15 +0000 |
| commit | ae022501f2a17f522b33db2af54ab42d7f456ce8 (patch) | |
| tree | 885ed90ae5acc688713d17c366a63dcc3f9b657e | |
| parent | 899abcf5131ee7e433935a599ca3d22e51bf18ac (diff) | |
| download | qemu-ae022501f2a17f522b33db2af54ab42d7f456ce8.zip | |
soft irq are just irqs (Ralf Baechle)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1470 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | cpu-exec.c | 2 | ||||
| -rw-r--r-- | target-mips/op_helper.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 20cb0df62e..c7cd607887 100644 --- 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 dc1040786e..854abea0c7 100644 --- 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, |