diff options
| author | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-04-06 18:46:01 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-04-06 18:46:01 +0000 |
| commit | f41c52f17031325652387086006c5847bc703abd (patch) | |
| tree | 7a48f39dd029a1aca329088e9e949c42f16c5221 /target-mips/op.c | |
| parent | 42a10898a8247821d161e3ac799b758f79fbe3b3 (diff) | |
Save state for all CP0 instructions, they may throw a CPU exception.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2622 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-mips/op.c')
| -rw-r--r-- | target-mips/op.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/target-mips/op.c b/target-mips/op.c index d440896f32..5048bc0f9f 100644 --- a/target-mips/op.c +++ b/target-mips/op.c @@ -1360,9 +1360,14 @@ void op_mtc0_status (void) no 64bit addressing implemented. */ val = (int32_t)T0 & 0xF878FF17; old = env->CP0_Status; + if (!(val & (1 << CP0St_EXL)) && + !(val & (1 << CP0St_ERL)) && + !(env->hflags & MIPS_HFLAG_DM) && + (val & (1 << CP0St_UM))) + env->hflags |= MIPS_HFLAG_UM; env->CP0_Status = val; - if (loglevel & CPU_LOG_TB_IN_ASM) - CALL_FROM_TB2(do_mtc0_status_debug, old, val); + if (loglevel & CPU_LOG_EXEC) + CALL_FROM_TB2(do_mtc0_status_debug, old, val); CALL_FROM_TB1(cpu_mips_update_irq, env); RETURN(); } @@ -2077,10 +2082,12 @@ void op_set_lladdr (void) RETURN(); } -void debug_eret (void); +void debug_pre_eret (void); +void debug_post_eret (void); void op_eret (void) { - CALL_FROM_TB0(debug_eret); + if (loglevel & CPU_LOG_EXEC) + CALL_FROM_TB0(debug_pre_eret); if (env->CP0_Status & (1 << CP0St_ERL)) { env->PC = env->CP0_ErrorEPC; env->CP0_Status &= ~(1 << CP0St_ERL); @@ -2093,13 +2100,16 @@ void op_eret (void) !(env->hflags & MIPS_HFLAG_DM) && (env->CP0_Status & (1 << CP0St_UM))) env->hflags |= MIPS_HFLAG_UM; + if (loglevel & CPU_LOG_EXEC) + CALL_FROM_TB0(debug_post_eret); env->CP0_LLAddr = 1; RETURN(); } void op_deret (void) { - CALL_FROM_TB0(debug_eret); + if (loglevel & CPU_LOG_EXEC) + CALL_FROM_TB0(debug_pre_eret); env->PC = env->CP0_DEPC; env->hflags |= MIPS_HFLAG_DM; if (!(env->CP0_Status & (1 << CP0St_EXL)) && @@ -2107,6 +2117,8 @@ void op_deret (void) !(env->hflags & MIPS_HFLAG_DM) && (env->CP0_Status & (1 << CP0St_UM))) env->hflags |= MIPS_HFLAG_UM; + if (loglevel & CPU_LOG_EXEC) + CALL_FROM_TB0(debug_post_eret); env->CP0_LLAddr = 1; RETURN(); } |