diff options
Diffstat (limited to 'target-sparc/int32_helper.c')
| -rw-r--r-- | target-sparc/int32_helper.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/target-sparc/int32_helper.c b/target-sparc/int32_helper.c index 5e33d50e23..c35f522e0f 100644 --- a/target-sparc/int32_helper.c +++ b/target-sparc/int32_helper.c @@ -19,9 +19,9 @@ #include "cpu.h" #include "trace.h" -#include "sysemu.h" +#include "sysemu/sysemu.h" -//#define DEBUG_PCALL +#define DEBUG_PCALL #ifdef DEBUG_PCALL static const char * const excp_names[0x80] = { @@ -62,6 +62,11 @@ void do_interrupt(CPUSPARCState *env) { int cwp, intno = env->exception_index; + /* Compute PSR before exposing state. */ + if (env->cc_op != CC_OP_FLAGS) { + cpu_get_psr(env); + } + #ifdef DEBUG_PCALL if (qemu_loglevel_mask(CPU_LOG_INT)) { static int count; @@ -78,10 +83,7 @@ void do_interrupt(CPUSPARCState *env) } } - qemu_log("%6d: %s (v=%02x) pc=%08x npc=%08x SP=%08x\n", - count, name, intno, - env->pc, - env->npc, env->regwptr[6]); + qemu_log("%6d: %s (v=%02x)\n", count, name, intno); log_cpu_state(env, 0); #if 0 { |