From patchwork Tue Sep 6 03:40:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 9315497 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 46B03601C0 for ; Tue, 6 Sep 2016 04:05:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D21D28B39 for ; Tue, 6 Sep 2016 04:05:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BBB528B3D; Tue, 6 Sep 2016 04:05:53 +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 8A6B928B39 for ; Tue, 6 Sep 2016 04:05:52 +0000 (UTC) Received: from localhost ([::1]:58255 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7dv-0007Fc-Bp for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Sep 2016 00:05:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7E3-0000nP-BY for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:39:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bh7E0-00073C-DN for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:39:06 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:50628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7Dz-0006zD-ST; Mon, 05 Sep 2016 23:39:04 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3sSslM0ZkJz9t2b; Tue, 6 Sep 2016 13:38:52 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1473133135; bh=NqYNWmE4UvPsoOpcY+e1j7tesZpcwVLjX0CFXavONsI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k6cBLd//WdzmpgUIgv+69L4tKH+RWQ+yZxIr+khUhvKvUn7XO3WIkVl0/LMYFAtx3 PkXaD+hSRMyhnPZTU26rBCqF+eIeISYg82ilTyTgOmfh6NNbLG45pKFXAC1ymBjZmQ AI84hP0YY9M2CPlAq4UrOLsekm8cFBcyUcXZJqek= From: David Gibson To: peter.maydell@linearo.org Date: Tue, 6 Sep 2016 13:40:13 +1000 Message-Id: <1473133253-17598-27-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 26/66] ppc: FP exceptions are always precise 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 don't implement imprecise FP exceptions and using store_current which sets SRR1 to the *previous* instruction never makes sense for these. So let's be truthful and make them precise, which is allowed by the architecture. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- target-ppc/excp_helper.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/target-ppc/excp_helper.c b/target-ppc/excp_helper.c index 96c6fd9..02d9e79 100644 --- a/target-ppc/excp_helper.c +++ b/target-ppc/excp_helper.c @@ -274,12 +274,13 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp) env->error_code = 0; return; } + + /* FP exceptions always have NIP pointing to the faulting + * instruction, so always use store_next and claim we are + * precise in the MSR. + */ msr |= 0x00100000; - if (msr_fe0 == msr_fe1) { - goto store_next; - } - msr |= 0x00010000; - break; + goto store_next; case POWERPC_EXCP_INVAL: LOG_EXCP("Invalid instruction at " TARGET_FMT_lx "\n", env->nip); msr |= 0x00080000;