From patchwork Tue Sep 6 03:40:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 666185 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sStN04WVfz9s3s for ; Tue, 6 Sep 2016 14:07:12 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b=K9DdTvXI; dkim-atps=neutral Received: from localhost ([::1]:58264 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7fB-0000Ih-Am for incoming@patchwork.ozlabs.org; Tue, 06 Sep 2016 00:07:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7E3-0000ok-Ha for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:39:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bh7Dy-00070z-Hu for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:39:07 -0400 Received: from ozlabs.org ([103.22.144.67]:59265) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7Dy-0006zO-77; Mon, 05 Sep 2016 23:39:02 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3sSslJ6WqBz9t1q; 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=1473133132; bh=H4EwoWo5zxl0HJnFzUyY8qsokA/WZbqGv+EMsMviWmU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K9DdTvXIb6VKY66vvWZ5DsbyC+dZrqkmtVteNPwMDcN7j+pH5p2CFwgJypdkH3GBg qXl2vipTd6w6tIkytXqWCjeP4n8ts1xhNWpz3z/keDrFKG0K6bkKM+6HoZFQ2MuHCg R7jxOvQRMDm9k+KNxNryQ5QnE8GcAke445YvOqW8= From: David Gibson To: peter.maydell@linearo.org Date: Tue, 6 Sep 2016 13:40:10 +1000 Message-Id: <1473133253-17598-24-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: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 23/66] ppc: Make float_invalid_op_excp() pass the return address 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Benjamin Herrenschmidt Instead of relying on NIP having been updated already Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- target-ppc/fpu_helper.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target-ppc/fpu_helper.c b/target-ppc/fpu_helper.c index e1f600a..8d881fc 100644 --- a/target-ppc/fpu_helper.c +++ b/target-ppc/fpu_helper.c @@ -19,6 +19,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/helper-proto.h" +#include "exec/exec-all.h" #define float64_snan_to_qnan(x) ((x) | 0x0008000000000000ULL) #define float32_snan_to_qnan(x) ((x) | 0x00400000) @@ -200,8 +201,9 @@ static inline uint64_t float_invalid_op_excp(CPUPPCState *env, int op, /* Update the floating-point enabled exception summary */ env->fpscr |= 1 << FPSCR_FEX; if (msr_fe0 != 0 || msr_fe1 != 0) { - helper_raise_exception_err(env, POWERPC_EXCP_PROGRAM, - POWERPC_EXCP_FP | op); + /* GETPC() works here because this is inline */ + raise_exception_err_ra(env, POWERPC_EXCP_PROGRAM, + POWERPC_EXCP_FP | op, GETPC()); } } return ret;