From patchwork Tue Nov 23 18:53:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 72736 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 C7486B70DF for ; Wed, 24 Nov 2010 06:09:18 +1100 (EST) Received: from localhost ([127.0.0.1]:52699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKyEt-0003Oi-W5 for incoming@patchwork.ozlabs.org; Tue, 23 Nov 2010 14:09:16 -0500 Received: from [140.186.70.92] (port=51310 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKy0D-00048i-Ht for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:54:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKy0A-0007Ax-Qd for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:54:05 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:30450) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKy0A-000780-GO for qemu-devel@nongnu.org; Tue, 23 Nov 2010 13:54:02 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.69) (envelope-from ) id 1PKxzz-0003R6-FK; Tue, 23 Nov 2010 18:53:51 +0000 From: Peter Maydell To: Anthony Liguori , qemu-devel@nongnu.org Date: Tue, 23 Nov 2010 18:53:47 +0000 Message-Id: <1290538431-13170-9-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1290538431-13170-1-git-send-email-peter.maydell@linaro.org> References: <1290538431-13170-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Subject: [Qemu-devel] [PATCH 08/12] ARM: Return correct result for single<->double conversion of NaN 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 The ARM ARM defines that if the input to a single<->double conversion is a NaN then the output is always forced to be a quiet NaN by setting the most significant bit of the fraction part. Signed-off-by: Peter Maydell --- target-arm/helper.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index 72ba314..356715c 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -2529,12 +2529,26 @@ float32 VFP_HELPER(tosiz, d)(float64 x, CPUState *env) /* floating point conversion */ float64 VFP_HELPER(fcvtd, s)(float32 x, CPUState *env) { - return float32_to_float64(x, &env->vfp.fp_status); + float64 r = float32_to_float64(x, &env->vfp.fp_status); + /* ARM requires that S<->D conversion of any kind of NaN generates + * a quiet NaN by forcing the most significant frac bit to 1. + */ + if (float64_is_signaling_nan(r)) { + return make_float64(float64_val(r) | (1LL << 51)); + } + return r; } float32 VFP_HELPER(fcvts, d)(float64 x, CPUState *env) { - return float64_to_float32(x, &env->vfp.fp_status); + float32 r = float64_to_float32(x, &env->vfp.fp_status); + /* ARM requires that S<->D conversion of any kind of NaN generates + * a quiet NaN by forcing the most significant frac bit to 1. + */ + if (float32_is_signaling_nan(r)) { + return make_float32(float32_val(r) | (1 << 22)); + } + return r; } /* VFP3 fixed point conversion. */