hw/i386/Makefile.obj: use $(PYTHON) to run .py scripts consistently

[qemu.git] / target-sparc / int64_helper.c

diff --git a/target-sparc/int64_helper.c b/target-sparc/int64_helper.c
index 5d0bc6c6d28c345f6df1c601d13a92887537b785..bf7dd86ab8264a8877b8a59e81fb2d179bf26a3f 100644 (file)
--- a/target-sparc/int64_helper.c
+++ b/target-sparc/int64_helper.c
@@ -59,11 +59,18 @@ static const char * const excp_names[0x80] = {
 };
 #endif
 
-void do_interrupt(CPUSPARCState *env)
+void sparc_cpu_do_interrupt(CPUState *cs)
 {
+    SPARCCPU *cpu = SPARC_CPU(cs);
+    CPUSPARCState *env = &cpu->env;
     int intno = env->exception_index;
     trap_state *tsptr;
 
+    /* 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;
@@ -85,7 +92,7 @@ void do_interrupt(CPUSPARCState *env)
         }
 
         qemu_log("%6d: %s (v=%04x)\n", count, name, intno);
-        log_cpu_state(env, 0);
+        log_cpu_state(cs, 0);
 #if 0
         {
             int i;