From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IoMuZ-0003wf-9L for qemu-devel@nongnu.org; Sat, 03 Nov 2007 13:35:55 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IoMuY-0003uT-EP for qemu-devel@nongnu.org; Sat, 03 Nov 2007 13:35:54 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IoMuY-0003tw-AI for qemu-devel@nongnu.org; Sat, 03 Nov 2007 13:35:54 -0400 Received: from hall.aurel32.net ([88.191.38.19]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1IoMuX-0004Qn-BL for qemu-devel@nongnu.org; Sat, 03 Nov 2007 13:35:53 -0400 Received: from aurel32 by hall.aurel32.net with local (Exim 4.63) (envelope-from ) id 1IoMuS-0004RG-FK for qemu-devel@nongnu.org; Sat, 03 Nov 2007 18:35:48 +0100 Date: Sat, 3 Nov 2007 18:35:48 +0100 From: Aurelien Jarno Message-ID: <20071103173548.GA16847@hall.aurel32.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Sender: "aurel32,,," Subject: [Qemu-devel] [PATCH] Fix NaN handling in softfloat Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Hi all, The current softfloat implementation changes qNaN into sNaN when converting between formats, for no reason. The attached patch fixes that. It also fixes an off-by-one in the extended double precision format (aka floatx80), the mantissa is 64-bit long and not 63-bit long. With this patch applied all the glibc 2.7 floating point tests are successfull on MIPS and MIPSEL. Bye, Aurelien Index: fpu/softfloat-specialize.h =================================================================== RCS file: /sources/qemu/qemu/fpu/softfloat-specialize.h,v retrieving revision 1.3 diff -u -d -p -r1.3 softfloat-specialize.h --- fpu/softfloat-specialize.h 11 May 2007 17:10:14 -0000 1.3 +++ fpu/softfloat-specialize.h 3 Nov 2007 17:21:38 -0000 @@ -121,8 +121,7 @@ static commonNaNT float32ToCommonNaN( fl static float32 commonNaNToFloat32( commonNaNT a ) { - return ( ( (bits32) a.sign )<<31 ) | 0x7FC00000 | ( a.high>>41 ); - + return ( ( (bits32) a.sign )<<31 ) | 0x7F800000 | ( a.high>>41 ); } /*---------------------------------------------------------------------------- @@ -233,7 +232,7 @@ static float64 commonNaNToFloat64( commo return ( ( (bits64) a.sign )<<63 ) - | LIT64( 0x7FF8000000000000 ) + | LIT64( 0x7FF0000000000000 ) | ( a.high>>12 ); } @@ -329,7 +328,7 @@ static commonNaNT floatx80ToCommonNaN( f if ( floatx80_is_signaling_nan( a ) ) float_raise( float_flag_invalid STATUS_VAR); z.sign = a.high>>15; z.low = 0; - z.high = a.low<<1; + z.high = a.low; return z; } @@ -343,7 +342,7 @@ static floatx80 commonNaNToFloatx80( com { floatx80 z; - z.low = LIT64( 0xC000000000000000 ) | ( a.high>>1 ); + z.low = a.high; z.high = ( ( (bits16) a.sign )<<15 ) | 0x7FFF; return z; @@ -449,7 +448,7 @@ static float128 commonNaNToFloat128( com float128 z; shift128Right( a.high, a.low, 16, &z.high, &z.low ); - z.high |= ( ( (bits64) a.sign )<<63 ) | LIT64( 0x7FFF800000000000 ); + z.high |= ( ( (bits64) a.sign )<<63 ) | LIT64( 0x7FFF000000000000 ); return z; } -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net