From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qr7AZ-0003eC-Mo for qemu-devel@nongnu.org; Wed, 10 Aug 2011 07:41:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qr7AV-0003Rz-Si for qemu-devel@nongnu.org; Wed, 10 Aug 2011 07:41:55 -0400 Received: from relay2.mail.vrmd.de ([81.28.224.28]:57771) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qr7AV-0003Rl-Nw for qemu-devel@nongnu.org; Wed, 10 Aug 2011 07:41:51 -0400 Received: from [81.28.224.139] (helo=webmail.variomedia.de) by relay2.mail.vrmd.de with esmtpa (Exim 4.74) (envelope-from ) id 1Qr7AS-0001ib-G7 for qemu-devel@nongnu.org; Wed, 10 Aug 2011 13:41:48 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Date: Wed, 10 Aug 2011 13:41:48 +0200 From: Sebastian Bauer Message-ID: <1dff061de511be8246b1e86a63cbf4a8@sebastianbauer.info> Subject: [Qemu-devel] [PATCH] PPC: Fix for the gdb single step problem on an rfi instruction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- diff --git a/target-ppc/translate.c b/target-ppc/translate.c index fd7c208..42b91fd 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -287,7 +287,7 @@ 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);