From patchwork Tue Sep 6 03:42:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 9315745 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 226A360760 for ; Tue, 6 Sep 2016 06:04:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1FA32287B8 for ; Tue, 6 Sep 2016 06:04:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1447D288F0; Tue, 6 Sep 2016 06:04:16 +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 59664287B8 for ; Tue, 6 Sep 2016 06:04:15 +0000 (UTC) Received: from localhost ([::1]:58984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh9UU-0000qd-De for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Sep 2016 02:04:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7GO-00039w-3f for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:41:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bh7GE-0007sp-MR for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:41:31 -0400 Received: from ozlabs.org ([103.22.144.67]:35904) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7GE-0007lI-9n; Mon, 05 Sep 2016 23:41:22 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3sSsp93M4Yz9t2T; Tue, 6 Sep 2016 13:41:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1473133281; bh=OKDfLJfSyUwRA/h5VOWMgmAw9rDAVa2A6zbz1xoIE78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R/9uTvAPTXXx5j8OAoXrZM3JrF4kKuvQ7T3YlP+qSIwbPCl+laKaJu2n8nGXc8/uS VzVmjUDFfrJNBuBWHwFmykkU9T8n6ONqu1eyHyvLdRkVctP4WMPOuLGLjbvmzQnPv0 CPu3T8PN4GO7UGtS86ZXFVXB/BoA0sOaPvr+4kLc= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 6 Sep 2016 13:42:46 +1000 Message-Id: <1473133396-18940-37-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473133396-18940-1-git-send-email-david@gibson.dropbear.id.au> References: <1473133396-18940-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 36/66] ppc: Don't update NIP if not taking alignment exceptions 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 Move the NIP update to after the conditional branch so that we don't do it if we aren't going to take the alignment exception Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- target-ppc/translate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index 93cd98c..6320ae5 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -2414,12 +2414,11 @@ static inline void gen_check_align(DisasContext *ctx, TCGv EA, int mask) TCGLabel *l1 = gen_new_label(); TCGv t0 = tcg_temp_new(); TCGv_i32 t1, t2; - /* NIP cannot be restored if the memory exception comes from an helper */ - gen_update_nip(ctx, ctx->nip - 4); tcg_gen_andi_tl(t0, EA, mask); tcg_gen_brcondi_tl(TCG_COND_EQ, t0, 0, l1); t1 = tcg_const_i32(POWERPC_EXCP_ALIGN); t2 = tcg_const_i32(0); + gen_update_nip(ctx, ctx->nip - 4); gen_helper_raise_exception_err(cpu_env, t1, t2); tcg_temp_free_i32(t1); tcg_temp_free_i32(t2);