From patchwork Tue Sep 6 03:42:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 9315747 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 84FFF60760 for ; Tue, 6 Sep 2016 06:05:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7802C288F0 for ; Tue, 6 Sep 2016 06:05:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AF6A28ACA; Tue, 6 Sep 2016 06:05:55 +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 AA590288F0 for ; Tue, 6 Sep 2016 06:05:54 +0000 (UTC) Received: from localhost ([::1]:59000 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh9W5-0002MO-77 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Sep 2016 02:05:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7GN-00039E-DZ for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:41:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bh7GD-0007rZ-C8 for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:41:30 -0400 Received: from ozlabs.org ([103.22.144.67]:47838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7GC-0007kg-Vg; Mon, 05 Sep 2016 23:41:21 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3sSsp81tWPz9sCZ; 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=1473133280; bh=HncgCZGWND3e7T05XjpEk4OlWoMpeyoY+LK7cBy39sQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=He/LqivgWKKWlI2lAsgu4AMTtGzg+Zuj1XPfMZlOhO85artQtbYBSOQXBMEV6Ot5O BWCbsaEogZ+hwwJZ4TBTEBhUiI+iePKRsMjP5OUYeI6neFGF8IusW8LGvvI4N/T0lZ btpRiO4e7NmsYoFRk2CYb+BxN96XTvFNKc8tuTuI= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 6 Sep 2016 13:42:44 +1000 Message-Id: <1473133396-18940-35-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 34/66] ppc: Don't update NIP BookE 2.06 tlbwe 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 This is no longer necessary as the helpers will properly retrieve the return address when needed. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- target-ppc/mmu_helper.c | 12 ++++++------ target-ppc/translate.c | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c index 692398c..696bb03 100644 --- a/target-ppc/mmu_helper.c +++ b/target-ppc/mmu_helper.c @@ -2598,9 +2598,9 @@ void helper_booke206_tlbwe(CPUPPCState *env) tlb = booke206_cur_tlb(env); if (!tlb) { - helper_raise_exception_err(env, POWERPC_EXCP_PROGRAM, - POWERPC_EXCP_INVAL | - POWERPC_EXCP_INVAL_INVAL); + raise_exception_err_ra(env, POWERPC_EXCP_PROGRAM, + POWERPC_EXCP_INVAL | + POWERPC_EXCP_INVAL_INVAL, GETPC()); } /* check that we support the targeted size */ @@ -2608,9 +2608,9 @@ void helper_booke206_tlbwe(CPUPPCState *env) size_ps = booke206_tlbnps(env, tlbn); if ((env->spr[SPR_BOOKE_MAS1] & MAS1_VALID) && (tlbncfg & TLBnCFG_AVAIL) && !(size_ps & (1 << size_tlb))) { - helper_raise_exception_err(env, POWERPC_EXCP_PROGRAM, - POWERPC_EXCP_INVAL | - POWERPC_EXCP_INVAL_INVAL); + raise_exception_err_ra(env, POWERPC_EXCP_PROGRAM, + POWERPC_EXCP_INVAL | + POWERPC_EXCP_INVAL_INVAL, GETPC()); } if (msr_gs) { diff --git a/target-ppc/translate.c b/target-ppc/translate.c index b62772b..f75cdc6 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -5849,7 +5849,6 @@ static void gen_tlbwe_booke206(DisasContext *ctx) GEN_PRIV; #else CHK_SV; - gen_update_nip(ctx, ctx->nip - 4); gen_helper_booke206_tlbwe(cpu_env); #endif /* defined(CONFIG_USER_ONLY) */ }