PPC32 Trace Exception and Trap instruction, by Jason Wessel.

diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 3f7a708712249bdc3e281760412539782d6664c3..70b0a491567b2be2774728036045414148506969 100644 (file)
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -1113,8 +1113,6 @@ void do_interrupt (CPUState *env)
         }
         goto store_next;
     case EXCP_TRACE: /* 0x0D00 */
-        /* XXX: TODO */
-        cpu_abort(env, "Trace exception is not implemented yet !\n");
         goto store_next;
     case EXCP_PERF: /* 0x0F00 */
         /* XXX: TODO */

diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 046f168bf902394e512076d0685cd15b05af3e13..41737d4a84b58c475bfaa663363df2a0fc6dadec 100644 (file)
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -1956,6 +1956,8 @@ GEN_HANDLER(tw, 0x1F, 0x04, 0xFF, 0x00000001, PPC_FLOW)
 {
     gen_op_load_gpr_T0(rA(ctx->opcode));
     gen_op_load_gpr_T1(rB(ctx->opcode));
+    /* Update the nip since this might generate a trap exception */
+    gen_op_update_nip(ctx->nip);
     gen_op_tw(TO(ctx->opcode));
 }