From patchwork Wed Feb 9 13:48:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 82465 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 DFF1AB70E2 for ; Thu, 10 Feb 2011 01:15:32 +1100 (EST) Received: from localhost ([127.0.0.1]:60493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PnAW5-0004Vc-4X for incoming@patchwork.ozlabs.org; Wed, 09 Feb 2011 08:55:33 -0500 Received: from [140.186.70.92] (port=58431 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PnAPE-0000vk-JV for qemu-devel@nongnu.org; Wed, 09 Feb 2011 08:48:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PnAPA-0004fG-8h for qemu-devel@nongnu.org; Wed, 09 Feb 2011 08:48:28 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:51013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PnAP9-0004b4-W3 for qemu-devel@nongnu.org; Wed, 09 Feb 2011 08:48:24 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.69) (envelope-from ) id 1PnAOy-0001Ja-Qp; Wed, 09 Feb 2011 13:48:12 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Wed, 9 Feb 2011 13:48:10 +0000 Message-Id: <1297259292-5025-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1297259292-5025-1-git-send-email-peter.maydell@linaro.org> References: <1297259292-5025-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: Christophe Lyon , patches@linaro.org Subject: [Qemu-devel] [PATCH 4/6] softfloat: Correctly handle NaNs in float16_to_float32() 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 Correctly handle NaNs in float16_to_float32(), by defining and using a float16ToCommonNaN() function, as we do with the other formats. Signed-off-by: Peter Maydell --- fpu/softfloat-specialize.h | 17 +++++++++++++++++ fpu/softfloat.c | 4 +--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/fpu/softfloat-specialize.h b/fpu/softfloat-specialize.h index 4907484..af82359 100644 --- a/fpu/softfloat-specialize.h +++ b/fpu/softfloat-specialize.h @@ -116,6 +116,23 @@ float16 float16_maybe_silence_nan(float16 a) } /*---------------------------------------------------------------------------- +| Returns the result of converting the half-precision floating-point NaN +| `a' to the canonical NaN format. If `a' is a signaling NaN, the invalid +| exception is raised. +*----------------------------------------------------------------------------*/ + +static commonNaNT float16ToCommonNaN( float16 a STATUS_PARAM ) +{ + commonNaNT z; + + if ( float16_is_signaling_nan( a ) ) float_raise( float_flag_invalid STATUS_VAR ); + z.sign = a >> 15; + z.low = 0; + z.high = ((bits64) a)<<54; + return z; +} + +/*---------------------------------------------------------------------------- | Returns the result of converting the canonical NaN `a' to the half- | precision floating-point format. *----------------------------------------------------------------------------*/ diff --git a/fpu/softfloat.c b/fpu/softfloat.c index 4d51428..735db38 100644 --- a/fpu/softfloat.c +++ b/fpu/softfloat.c @@ -2733,9 +2733,7 @@ float32 float16_to_float32(float16 a, flag ieee STATUS_PARAM) if (aExp == 0x1f && ieee) { if (aSig) { - /* Make sure correct exceptions are raised. */ - float32ToCommonNaN(a STATUS_VAR); - aSig |= 0x200; + return commonNaNToFloat32(float16ToCommonNaN(a STATUS_VAR) STATUS_VAR); } return packFloat32(aSign, 0xff, aSig << 13); }