Commit ae022501f2a17f522b33db2af54ab42d7f456ce8
1 parent
899abcf5
soft irq are just irqs (Ralf Baechle)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1470 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
2 additions
and
2 deletions
cpu-exec.c
| @@ -307,7 +307,7 @@ int cpu_exec(CPUState *env1) | @@ -307,7 +307,7 @@ int cpu_exec(CPUState *env1) | ||
| 307 | #elif defined(TARGET_MIPS) | 307 | #elif defined(TARGET_MIPS) |
| 308 | if ((interrupt_request & CPU_INTERRUPT_HARD) && | 308 | if ((interrupt_request & CPU_INTERRUPT_HARD) && |
| 309 | (env->CP0_Status & (1 << CP0St_IE)) && | 309 | (env->CP0_Status & (1 << CP0St_IE)) && |
| 310 | - (env->CP0_Cause & 0x0000FC00) && | 310 | + (env->CP0_Cause & 0x0000FF00) && |
| 311 | !(env->hflags & MIPS_HFLAG_EXL) && | 311 | !(env->hflags & MIPS_HFLAG_EXL) && |
| 312 | !(env->hflags & MIPS_HFLAG_ERL) && | 312 | !(env->hflags & MIPS_HFLAG_ERL) && |
| 313 | !(env->hflags & MIPS_HFLAG_DM)) { | 313 | !(env->hflags & MIPS_HFLAG_DM)) { |
target-mips/op_helper.c
| @@ -352,7 +352,7 @@ void do_mtc0 (int reg, int sel) | @@ -352,7 +352,7 @@ void do_mtc0 (int reg, int sel) | ||
| 352 | old = env->CP0_Status; | 352 | old = env->CP0_Status; |
| 353 | env->CP0_Status = val; | 353 | env->CP0_Status = val; |
| 354 | /* If we unmasked an asserted IRQ, raise it */ | 354 | /* If we unmasked an asserted IRQ, raise it */ |
| 355 | - mask = 0x0000FC00; | 355 | + mask = 0x0000FF00; |
| 356 | if (loglevel & CPU_LOG_TB_IN_ASM) { | 356 | if (loglevel & CPU_LOG_TB_IN_ASM) { |
| 357 | fprintf(logfile, "Status %08x => %08x Cause %08x (%08x %08x %08x)\n", | 357 | fprintf(logfile, "Status %08x => %08x Cause %08x (%08x %08x %08x)\n", |
| 358 | old, val, env->CP0_Cause, old & mask, val & mask, | 358 | old, val, env->CP0_Cause, old & mask, val & mask, |