From patchwork Tue Sep 6 03:40:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 9315529 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EDC3E60752 for ; Tue, 6 Sep 2016 04:23:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA5D7284FF for ; Tue, 6 Sep 2016 04:23:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF3B028B03; Tue, 6 Sep 2016 04:23:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 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 mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 75578284FF for ; Tue, 6 Sep 2016 04:23:35 +0000 (UTC) Received: from localhost ([::1]:58362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7v4-0005jr-Ao for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Sep 2016 00:23:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7EE-0000zf-Pp for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:39:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bh7E6-0007AZ-0y for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:39:17 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:58954) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7E5-0006zv-DK; Mon, 05 Sep 2016 23:39:09 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3sSslQ2M2wz9vFY; Tue, 6 Sep 2016 13:38:56 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1473133138; bh=6ZniVHU0z44bXq7Bqvm6g7N9pmPC/2JzvVykFIEOahQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HDizlaLUoovSCGad8GPVA6UuSGqhBEVkQEygX5ekT3PiQjFveUU20pH7B53C7jnr3 NUgPSvC9XqiGUaFhSz72ERmjSWyTPoWRkKrW7YlI+Y8R6S3Ac+z8LhnvrjlfWu4flb ZPjlU1DAiSEVzp5RASPf/VQLriY3jP7F8TClXCM4= From: David Gibson To: peter.maydell@linearo.org Date: Tue, 6 Sep 2016 13:40:28 +1000 Message-Id: <1473133253-17598-42-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473133253-17598-1-git-send-email-david@gibson.dropbear.id.au> References: <1473133253-17598-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 41/66] ppc: Fix CFAR updates 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: David Gibson , qemu-ppc@nongnu.org, agraf@suse.de, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Benjamin Herrenschmidt We were one instruction off Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- target-ppc/translate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index ac2c79b..bc5b2ee 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -3346,7 +3346,7 @@ static void gen_b(DisasContext *ctx) if (LK(ctx->opcode)) { gen_setlr(ctx, ctx->nip); } - gen_update_cfar(ctx, ctx->nip); + gen_update_cfar(ctx, ctx->nip - 4); gen_goto_tb(ctx, 0, target); } @@ -3411,7 +3411,7 @@ static inline void gen_bcond(DisasContext *ctx, int type) } tcg_temp_free_i32(temp); } - gen_update_cfar(ctx, ctx->nip); + gen_update_cfar(ctx, ctx->nip - 4); if (type == BCOND_IM) { target_ulong li = (target_long)((int16_t)(BD(ctx->opcode))); if (likely(AA(ctx->opcode) == 0)) { @@ -3526,7 +3526,7 @@ static void gen_rfi(DisasContext *ctx) */ /* Restore CPU state */ CHK_SV; - gen_update_cfar(ctx, ctx->nip); + gen_update_cfar(ctx, ctx->nip - 4); gen_helper_rfi(cpu_env); gen_sync_exception(ctx); #endif @@ -3540,7 +3540,7 @@ static void gen_rfid(DisasContext *ctx) #else /* Restore CPU state */ CHK_SV; - gen_update_cfar(ctx, ctx->nip); + gen_update_cfar(ctx, ctx->nip - 4); gen_helper_rfid(cpu_env); gen_sync_exception(ctx); #endif