From 1b2ad2ec7a79634f8186098dbe34a162d4851ded Mon Sep 17 00:00:00 2001 From: aurel32 Date: Mon, 15 Dec 2008 17:14:12 +0000 Subject: [PATCH] softfloat-native: fix *nan() Fix float64_is_nan() Fix floatx80_is_signaling_nan() Add floatx80_is_nan() Signed-off-by: Aurelien Jarno git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6049 c046a42c-6fe2-441c-8c8c-71466251a162 --- fpu/softfloat-native.c | 15 ++++++++++++++- fpu/softfloat-native.h | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/fpu/softfloat-native.c b/fpu/softfloat-native.c index cd88113f9e..7273ae5b4f 100644 --- a/fpu/softfloat-native.c +++ b/fpu/softfloat-native.c @@ -431,7 +431,7 @@ int float64_is_nan( float64 a1 ) u.f = a1; a = u.i; - return ( LIT64( 0xFFE0000000000000 ) < (bits64) ( a<<1 ) ); + return ( LIT64( 0xFFF0000000000000 ) < (bits64) ( a<<1 ) ); } @@ -507,6 +507,19 @@ int floatx80_compare_quiet( floatx80 a, floatx80 b STATUS_PARAM ) int floatx80_is_signaling_nan( floatx80 a1) { floatx80u u; + uint64_t aLow; + u.f = a1; + + aLow = u.i.low & ~ LIT64( 0x4000000000000000 ); + return + ( ( u.i.high & 0x7FFF ) == 0x7FFF ) + && (bits64) ( aLow<<1 ) + && ( u.i.low == aLow ); +} + +int floatx80_is_nan( floatx80 a1 ) +{ + floatx80u u; u.f = a1; return ( ( u.i.high & 0x7FFF ) == 0x7FFF ) && (bits64) ( u.i.low<<1 ); } diff --git a/fpu/softfloat-native.h b/fpu/softfloat-native.h index 817a2a8137..f0a7c2e53b 100644 --- a/fpu/softfloat-native.h +++ b/fpu/softfloat-native.h @@ -425,6 +425,7 @@ INLINE int floatx80_unordered( floatx80 a, floatx80 b STATUS_PARAM) int floatx80_compare( floatx80, floatx80 STATUS_PARAM ); int floatx80_compare_quiet( floatx80, floatx80 STATUS_PARAM ); int floatx80_is_signaling_nan( floatx80 ); +int floatx80_is_nan( floatx80 ); INLINE floatx80 floatx80_abs(floatx80 a) { -- 2.11.4.GIT