From patchwork Fri Oct 28 01:37:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 688039 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t4nb83thRz9s9N for ; Fri, 28 Oct 2016 13:22:28 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b=Yw4Y3m+H; dkim-atps=neutral Received: from localhost ([::1]:45734 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzwoM-0005Af-BS for incoming@patchwork.ozlabs.org; Thu, 27 Oct 2016 22:22:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzw9Z-00037Z-G5 for qemu-devel@nongnu.org; Thu, 27 Oct 2016 21:40:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzw9V-0003eu-DU for qemu-devel@nongnu.org; Thu, 27 Oct 2016 21:40:17 -0400 Received: from ozlabs.org ([103.22.144.67]:39391) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzw9V-0003dl-1q; Thu, 27 Oct 2016 21:40:13 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3t4mcR3pl5z9vDY; Fri, 28 Oct 2016 12:38:28 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1477618711; bh=NFdTpleRgf84wexsznqhaoPwI+i86dDJAaO6PUFz6zo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yw4Y3m+HByKPaECfAByG+MpuSLtQCDQh6xVETf6brAd4ICgpyHMzhFJoYwoj/oQ4F 34glbp39rQpqLK4KcEfwcRGFHYlyOMbp1cFoWMi69zSVHj98CKqEd5EEaibNX3zBa3 XnY/08LDFHHWUg8MG694UlsuSB9BDdWMQ/VyZhzU= From: David Gibson To: peter.maydell@linaro.org Date: Fri, 28 Oct 2016 12:37:22 +1100 Message-Id: <1477618694-21019-22-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477618694-21019-1-git-send-email-david@gibson.dropbear.id.au> References: <1477618694-21019-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 21/73] ppc: Fix single step with gdb stub X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, aik@ozlabs.ru, mark.cave-ayland@ilande.co.uk, agraf@suse.de, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, clg@kaod.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Benjamin Herrenschmidt Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- target-ppc/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 94989b2..43505a9 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -322,7 +322,7 @@ static void gen_debug_exception(DisasContext *ctx) */ if ((ctx->exception != POWERPC_EXCP_BRANCH) && (ctx->exception != POWERPC_EXCP_SYNC)) { - gen_update_nip(ctx, ctx->nip - 4); + gen_update_nip(ctx, ctx->nip); } t0 = tcg_const_i32(EXCP_DEBUG); gen_helper_raise_exception(cpu_env, t0);