From patchwork Tue Sep 6 03:42:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 9315641 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 5D24360752 for ; Tue, 6 Sep 2016 05:12:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4ADED28993 for ; Tue, 6 Sep 2016 05:12:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E0C628B56; Tue, 6 Sep 2016 05:12:14 +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 C90F428993 for ; Tue, 6 Sep 2016 05:12:12 +0000 (UTC) Received: from localhost ([::1]:58655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh8g7-0005uO-Lh for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Sep 2016 01:12:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7GE-00030c-No for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:41:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bh7GA-0007oJ-CQ for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:41:22 -0400 Received: from ozlabs.org ([103.22.144.67]:47838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7GA-0007kg-0h; Mon, 05 Sep 2016 23:41:18 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3sSsp52NwYz9ryT; Tue, 6 Sep 2016 13:41:16 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1473133277; bh=BgUMCMosDd7udiYCByxbNxGPAT/nt13JWgoy6SusgDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M5x6BDlkLtoxgeXKuV+hcZenTahfe1Zeh6SZBIKq6WeJ4PodhDpRGtOEtxXNLsUpk pgZD6781Qt1g6Uur1WYqROZz6fiu1+74UHN8qd25sc0A33ZWJjcudzqlbQ7O8TZiVC pXG5prsWuQKq8BF1cfwPmDqvwT6x0w7rDuG7F1Oc= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 6 Sep 2016 13:42:39 +1000 Message-Id: <1473133396-18940-30-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 29/66] ppc: Make tlb_fill() use new exception helper 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 Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- target-ppc/mmu_helper.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c index 737f338..692398c 100644 --- a/target-ppc/mmu_helper.c +++ b/target-ppc/mmu_helper.c @@ -2892,10 +2892,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type, ret = cpu_ppc_handle_mmu_fault(env, addr, access_type, mmu_idx); } if (unlikely(ret != 0)) { - if (likely(retaddr)) { - /* now we have a real cpu fault */ - cpu_restore_state(cs, retaddr); - } - helper_raise_exception_err(env, cs->exception_index, env->error_code); + raise_exception_err_ra(env, cs->exception_index, env->error_code, + retaddr); } }