From: Sebastian Bauer <mail@sebastianbauer.info>
Date: Wed, 10 Aug 2011 01:41:48 +0000 (+0000)
Subject: PPC: Fix for the gdb single step problem on an rfi instruction
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ee2b39946312952f5aa99cf9b7bab238cd5b6329;p=qmiga%2Fqemu.git

PPC: Fix for the gdb single step problem on an rfi instruction

When using gdb to single step a ppc interrupt routine, the execution
flow passes the rfi instruction without actually returning from the
interrupt.

The patch fixes this by avoiding to update the nip when the debug
exception is raised and a previous POWERPC_EXCP_SYNC was set.

The latter is the case only, if code for rfi or a related instruction
was generated.

Signed-off-by: Sebastian Bauer <mail@sebastianbauer.info>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 99e995c7b6..66eae30209 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -298,8 +298,10 @@ static inline void gen_debug_exception(DisasContext *ctx)
 {
     TCGv_i32 t0;
 
-    if (ctx->exception != POWERPC_EXCP_BRANCH)
+    if ((ctx->exception != POWERPC_EXCP_BRANCH) &&
+        (ctx->exception != POWERPC_EXCP_SYNC)) {
         gen_update_nip(ctx, ctx->nip);
+    }
     t0 = tcg_const_i32(EXCP_DEBUG);
     gen_helper_raise_exception(t0);
     tcg_temp_free_i32(t0);