From patchwork Mon Mar 14 15:37:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 86766 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AFA28B6F90 for ; Tue, 15 Mar 2011 02:50:48 +1100 (EST) Received: from localhost ([127.0.0.1]:34676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PzA2e-0008NN-08 for incoming@patchwork.ozlabs.org; Mon, 14 Mar 2011 11:50:44 -0400 Received: from [140.186.70.92] (port=33077 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pz9z3-0006nD-1p for qemu-devel@nongnu.org; Mon, 14 Mar 2011 11:47:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pz9z0-0001tk-17 for qemu-devel@nongnu.org; Mon, 14 Mar 2011 11:46:59 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:52580) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pz9yz-0001sv-J3 for qemu-devel@nongnu.org; Mon, 14 Mar 2011 11:46:57 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1Pz9pZ-00073t-Ni; Mon, 14 Mar 2011 15:37:13 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 14 Mar 2011 15:37:12 +0000 Message-Id: <1300117033-27120-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1300117033-27120-1-git-send-email-peter.maydell@linaro.org> References: <1300117033-27120-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: patches@linaro.org Subject: [Qemu-devel] [PATCH v2 1/2] target-arm: Fix VRECPS edge cases handling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Correct the handling of edge cases for the VRECPS instruction: * this is a Neon instruction so uses the "standard FPSCR value" * (zero, inf) is a special case which returns 2.0 Signed-off-by: Peter Maydell --- target-arm/helper.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index d360121..c01a5a2 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2707,11 +2707,16 @@ uint32_t HELPER(vfp_fcvt_f32_to_f16)(float32 a, CPUState *env) return do_fcvt_f32_to_f16(a, env, &env->vfp.fp_status); } +#define float32_two make_float32(0x40000000) + float32 HELPER(recps_f32)(float32 a, float32 b, CPUState *env) { - float_status *s = &env->vfp.fp_status; - float32 two = int32_to_float32(2, s); - return float32_sub(two, float32_mul(a, b, s), s); + float_status *s = &env->vfp.standard_fp_status; + if ((float32_is_infinity(a) && float32_is_zero_or_denormal(b)) || + (float32_is_infinity(b) && float32_is_zero_or_denormal(a))) { + return float32_two; + } + return float32_sub(float32_two, float32_mul(a, b, s), s); } float32 HELPER(rsqrts_f32)(float32 a, float32 b, CPUState *env)