Softfloat fcvt.{w/h}.s now returns -MaxInt for -NaN

Andrew Waterman · ccelio · commit 7e4df4d518b5 · 2015-02-22T19:27:37.000-08:00
Behavior now consistent with RISC-V user spec.
diff --git a/softfloat/f32_to_i32.c b/softfloat/f32_to_i32.c
@@ -21,7 +21,6 @@ int_fast32_t f32_to_i32( float32_t a, int_fast8_t roundingMode, bool exact )
     sign = signF32UI( uiA );
     exp = expF32UI( uiA );
     sig = fracF32UI( uiA );
-    if ( ( exp == 0xFF ) && sig ) sign = 0;
     if ( exp ) sig |= 0x00800000;
     sig64 = (uint_fast64_t) sig<<32;
     shiftCount = 0xAF - exp;
diff --git a/softfloat/f32_to_i64.c b/softfloat/f32_to_i64.c
@@ -25,7 +25,7 @@ int_fast64_t f32_to_i64( float32_t a, int_fast8_t roundingMode, bool exact )
     shiftCount = 0xBE - exp;
     if ( shiftCount < 0 ) {
         softfloat_raiseFlags( softfloat_flag_invalid );
-        if ( ! sign || ( ( exp == 0xFF ) && sig ) ) {
+        if ( ! sign ) {
             return INT64_C( 0x7FFFFFFFFFFFFFFF );
         }
         return - INT64_C( 0x7FFFFFFFFFFFFFFF ) - 1;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ int_fast64_t f32_to_i64( float32_t a, int_fast8_t roundingMode, bool exact )`
`25`	`25`	`shiftCount = 0xBE - exp;`
`26`	`26`	`if ( shiftCount < 0 ) {`
`27`	`27`	`softfloat_raiseFlags( softfloat_flag_invalid );`
`28`		`- if ( ! sign \|\| ( ( exp == 0xFF ) && sig ) ) {`
	`28`	`+ if ( ! sign ) {`
`29`	`29`	`return INT64_C( 0x7FFFFFFFFFFFFFFF );`
`30`	`30`	`}`
`31`	`31`	`return - INT64_C( 0x7FFFFFFFFFFFFFFF ) - 1;`