From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52530 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPzhq-0001Ab-OV for qemu-devel@nongnu.org; Tue, 07 Dec 2010 10:43:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPzho-0006bf-Pt for qemu-devel@nongnu.org; Tue, 07 Dec 2010 10:43:54 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:13451) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPzho-0006Zf-Fs for qemu-devel@nongnu.org; Tue, 07 Dec 2010 10:43:52 -0500 From: Peter Maydell Date: Tue, 7 Dec 2010 15:43:39 +0000 Message-Id: <1291736623-3695-11-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1291736623-3695-1-git-send-email-peter.maydell@linaro.org> References: <1291736623-3695-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 10/14] softfloat: Add float*_maybe_silence_nan() functions List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel@nongnu.org Add functions float*_maybe_silence_nan() which ensure that a value is not a signaling NaN by turning it into a quiet NaN. Signed-off-by: Peter Maydell Reviewed-by: Nathan Froyd --- fpu/softfloat-specialize.h | 38 ++++++++++++++++++++++++++++++++++++++ fpu/softfloat.h | 2 ++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/fpu/softfloat-specialize.h b/fpu/softfloat-specialize.h index 8e6aceb..0746878 100644 --- a/fpu/softfloat-specialize.h +++ b/fpu/softfloat-specialize.h @@ -102,6 +102,25 @@ int float32_is_signaling_nan( float32 a_ ) } /*---------------------------------------------------------------------------- +| Returns a quiet NaN if the single-precision floating point value `a' is a +| signaling NaN; otherwise returns `a'. +*----------------------------------------------------------------------------*/ + +float32 float32_maybe_silence_nan( float32 a_ ) +{ + if (float32_is_signaling_nan(a_)) { + uint32_t a = float32_val(a_); +#if SNAN_BIT_IS_ONE + a &= ~(1 << 22); +#else + a |= (1 << 22); +#endif + return make_float32(a); + } + return a_; +} + +/*---------------------------------------------------------------------------- | Returns the result of converting the single-precision floating-point NaN | `a' to the canonical NaN format. If `a' is a signaling NaN, the invalid | exception is raised. @@ -234,6 +253,25 @@ int float64_is_signaling_nan( float64 a_ ) } /*---------------------------------------------------------------------------- +| Returns a quiet NaN if the double-precision floating point value `a' is a +| signaling NaN; otherwise returns `a'. +*----------------------------------------------------------------------------*/ + +float64 float64_maybe_silence_nan( float64 a_ ) +{ + if (float64_is_signaling_nan(a_)) { + bits64 a = float64_val(a_); +#if SNAN_BIT_IS_ONE + a &= ~LIT64( 0x0008000000000000 ); +#else + a |= LIT64( 0x0008000000000000 ); +#endif + return make_float64(a); + } + return a_; +} + +/*---------------------------------------------------------------------------- | Returns the result of converting the double-precision floating-point NaN | `a' to the canonical NaN format. If `a' is a signaling NaN, the invalid | exception is raised. diff --git a/fpu/softfloat.h b/fpu/softfloat.h index 9bece80..2e651e2 100644 --- a/fpu/softfloat.h +++ b/fpu/softfloat.h @@ -287,6 +287,7 @@ int float32_compare( float32, float32 STATUS_PARAM ); int float32_compare_quiet( float32, float32 STATUS_PARAM ); int float32_is_nan( float32 ); int float32_is_signaling_nan( float32 ); +float32 float32_maybe_silence_nan( float32 ); float32 float32_scalbn( float32, int STATUS_PARAM ); INLINE float32 float32_abs(float32 a) @@ -364,6 +365,7 @@ int float64_compare( float64, float64 STATUS_PARAM ); int float64_compare_quiet( float64, float64 STATUS_PARAM ); int float64_is_nan( float64 a ); int float64_is_signaling_nan( float64 ); +float64 float64_maybe_silence_nan( float64 ); float64 float64_scalbn( float64, int STATUS_PARAM ); INLINE float64 float64_abs(float64 a) -- 1.6.3.3