Browse Source

Fix softfloat float->int corner cases

pull/9/head
Andrew Waterman 11 years ago
parent
commit
a4ae7da6ef
  1. 1
      softfloat/f32_to_i32.c
  2. 2
      softfloat/f32_to_i64.c
  3. 1
      softfloat/f64_to_i32.c
  4. 2
      softfloat/f64_to_i64.c

1
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;

2
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;

1
softfloat/f64_to_i32.c

@ -20,7 +20,6 @@ int_fast32_t f64_to_i32( float64_t a, int_fast8_t roundingMode, bool exact )
sign = signF64UI( uiA );
exp = expF64UI( uiA );
sig = fracF64UI( uiA );
if ( ( exp == 0x7FF ) && sig ) sign = 0;
if ( exp ) sig |= UINT64_C( 0x0010000000000000 );
shiftCount = 0x42C - exp;
if ( 0 < shiftCount ) sig = softfloat_shift64RightJam( sig, shiftCount );

2
softfloat/f64_to_i64.c

@ -28,8 +28,6 @@ int_fast64_t f64_to_i64( float64_t a, int_fast8_t roundingMode, bool exact )
softfloat_raiseFlags( softfloat_flag_invalid );
return
! sign
|| ( ( exp == 0x7FF )
&& ( sig != UINT64_C( 0x0010000000000000 ) ) )
? INT64_C( 0x7FFFFFFFFFFFFFFF )
: - INT64_C( 0x7FFFFFFFFFFFFFFF ) - 1;
}

Loading…
Cancel
Save