Re: [Qemu-devel] [PATCH] softfloat: define floatx80_default_inf

[Philippe Mathieu-Daudé]

On Thu, Jun 29, 2017 at 4:04 PM, Laurent Vivier <address@hidden> wrote:
> Signed-off-by: Laurent Vivier <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  fpu/softfloat-specialize.h | 10 ++++++++++
>  fpu/softfloat.c            | 38 ++++++++++++++++++++++++++------------
>  include/fpu/softfloat.h    |  8 +++++++-
>  3 files changed, 43 insertions(+), 13 deletions(-)
>
> diff --git a/fpu/softfloat-specialize.h b/fpu/softfloat-specialize.h
> index de2c5d5..139b197 100644
> --- a/fpu/softfloat-specialize.h
> +++ b/fpu/softfloat-specialize.h
> @@ -178,6 +178,16 @@ floatx80 floatx80_default_nan(float_status *status)
>  }
>
>  
> /*----------------------------------------------------------------------------
> +| The pattern for a default generated extended double-precision inf.
> +*----------------------------------------------------------------------------*/
> +
> +#define floatx80_default_inf_high 0x7FFF
> +#define floatx80_default_inf_low  LIT64(0x8000000000000000)
> +
> +const floatx80 floatx80_default_inf
> +    = make_floatx80_init(floatx80_default_inf_high, 
> floatx80_default_inf_low);
> +
> +/*----------------------------------------------------------------------------
>  | The pattern for a default generated quadruple-precision NaN.
>  
> *----------------------------------------------------------------------------*/
>  float128 float128_default_nan(float_status *status)
> diff --git a/fpu/softfloat.c b/fpu/softfloat.c
> index 7af14e2..67f1dd9 100644
> --- a/fpu/softfloat.c
> +++ b/fpu/softfloat.c
> @@ -913,7 +913,9 @@ static floatx80 roundAndPackFloatx80(int8_t 
> roundingPrecision, flag zSign,
>                 ) {
>                  return packFloatx80( zSign, 0x7FFE, ~ roundMask );
>              }
> -            return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) 
> );
> +            return packFloatx80(zSign,
> +                                floatx80_default_inf_high,
> +                                floatx80_default_inf_low);
>          }
>          if ( zExp <= 0 ) {
>              isTiny =
> @@ -1885,7 +1887,9 @@ floatx80 float32_to_floatx80(float32 a, float_status 
> *status)
>          if (aSig) {
>              return commonNaNToFloatx80(float32ToCommonNaN(a, status), 
> status);
>          }
> -        return packFloatx80( aSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
> +        return packFloatx80(aSign,
> +                            floatx80_default_inf_high,
> +                            floatx80_default_inf_low);
>      }
>      if ( aExp == 0 ) {
>          if ( aSig == 0 ) return packFloatx80( aSign, 0, 0 );
> @@ -3666,7 +3670,9 @@ floatx80 float64_to_floatx80(float64 a, float_status 
> *status)
>          if (aSig) {
>              return commonNaNToFloatx80(float64ToCommonNaN(a, status), 
> status);
>          }
> -        return packFloatx80( aSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
> +        return packFloatx80(aSign,
> +                            floatx80_default_inf_high,
> +                            floatx80_default_inf_low);
>      }
>      if ( aExp == 0 ) {
>          if ( aSig == 0 ) return packFloatx80( aSign, 0, 0 );
> @@ -4927,8 +4933,8 @@ int64_t floatx80_to_int64(floatx80 a, float_status 
> *status)
>          if ( shiftCount ) {
>              float_raise(float_flag_invalid, status);
>              if (    ! aSign
> -                 || (    ( aExp == 0x7FFF )
> -                      && ( aSig != LIT64( 0x8000000000000000 ) ) )
> +                 || ((aExp == floatx80_default_inf_high)
> +                     && (aSig != floatx80_default_inf_low))
>                 ) {
>                  return LIT64( 0x7FFFFFFFFFFFFFFF );
>              }
> @@ -5219,7 +5225,9 @@ static floatx80 addFloatx80Sigs(floatx80 a, floatx80 b, 
> flag zSign,
>              if ((uint64_t)(bSig << 1)) {
>                  return propagateFloatx80NaN(a, b, status);
>              }
> -            return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) 
> );
> +            return packFloatx80(zSign,
> +                                floatx80_default_inf_high,
> +                                floatx80_default_inf_low);
>          }
>          if ( aExp == 0 ) ++expDiff;
>          shift64ExtraRightJamming( aSig, 0, - expDiff, &aSig, &zSig1 );
> @@ -5294,7 +5302,8 @@ static floatx80 subFloatx80Sigs(floatx80 a, floatx80 b, 
> flag zSign,
>          if ((uint64_t)(bSig << 1)) {
>              return propagateFloatx80NaN(a, b, status);
>          }
> -        return packFloatx80( zSign ^ 1, 0x7FFF, LIT64( 0x8000000000000000 ) 
> );
> +        return packFloatx80(zSign ^ 1, floatx80_default_inf_high,
> +                            floatx80_default_inf_low);
>      }
>      if ( aExp == 0 ) ++expDiff;
>      shift128RightJamming( aSig, 0, - expDiff, &aSig, &zSig1 );
> @@ -5399,7 +5408,8 @@ floatx80 floatx80_mul(floatx80 a, floatx80 b, 
> float_status *status)
>              return propagateFloatx80NaN(a, b, status);
>          }
>          if ( ( bExp | bSig ) == 0 ) goto invalid;
> -        return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
> +        return packFloatx80(zSign, floatx80_default_inf_high,
> +                                   floatx80_default_inf_low);
>      }
>      if ( bExp == 0x7FFF ) {
>          if ((uint64_t)(bSig << 1)) {
> @@ -5410,7 +5420,8 @@ floatx80 floatx80_mul(floatx80 a, floatx80 b, 
> float_status *status)
>              float_raise(float_flag_invalid, status);
>              return floatx80_default_nan(status);
>          }
> -        return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
> +        return packFloatx80(zSign, floatx80_default_inf_high,
> +                                   floatx80_default_inf_low);
>      }
>      if ( aExp == 0 ) {
>          if ( aSig == 0 ) return packFloatx80( zSign, 0, 0 );
> @@ -5464,7 +5475,8 @@ floatx80 floatx80_div(floatx80 a, floatx80 b, 
> float_status *status)
>              }
>              goto invalid;
>          }
> -        return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
> +        return packFloatx80(zSign, floatx80_default_inf_high,
> +                                   floatx80_default_inf_low);
>      }
>      if ( bExp == 0x7FFF ) {
>          if ((uint64_t)(bSig << 1)) {
> @@ -5480,7 +5492,8 @@ floatx80 floatx80_div(floatx80 a, floatx80 b, 
> float_status *status)
>                  return floatx80_default_nan(status);
>              }
>              float_raise(float_flag_divbyzero, status);
> -            return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) 
> );
> +            return packFloatx80(zSign, floatx80_default_inf_high,
> +                                       floatx80_default_inf_low);
>          }
>          normalizeFloatx80Subnormal( bSig, &bExp, &bSig );
>      }
> @@ -6303,7 +6316,8 @@ floatx80 float128_to_floatx80(float128 a, float_status 
> *status)
>          if ( aSig0 | aSig1 ) {
>              return commonNaNToFloatx80(float128ToCommonNaN(a, status), 
> status);
>          }
> -        return packFloatx80( aSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
> +        return packFloatx80(aSign, floatx80_default_inf_high,
> +                                   floatx80_default_inf_low);
>      }
>      if ( aExp == 0 ) {
>          if ( ( aSig0 | aSig1 ) == 0 ) return packFloatx80( aSign, 0, 0 );
> diff --git a/include/fpu/softfloat.h b/include/fpu/softfloat.h
> index f1288ef..f0dff25 100644
> --- a/include/fpu/softfloat.h
> +++ b/include/fpu/softfloat.h
> @@ -619,6 +619,11 @@ float64 floatx80_to_float64(floatx80, float_status 
> *status);
>  float128 floatx80_to_float128(floatx80, float_status *status);
>
>  
> /*----------------------------------------------------------------------------
> +| The pattern for a default generated extended double-precision inf.
> +*----------------------------------------------------------------------------*/
> +extern const floatx80 floatx80_default_inf;
> +
> +/*----------------------------------------------------------------------------
>  | Software IEC/IEEE extended double-precision operations.
>  
> *----------------------------------------------------------------------------*/
>  floatx80 floatx80_round_to_int(floatx80, float_status *status);
> @@ -657,7 +662,8 @@ static inline floatx80 floatx80_chs(floatx80 a)
>
>  static inline int floatx80_is_infinity(floatx80 a)
>  {
> -    return (a.high & 0x7fff) == 0x7fff && a.low == 0x8000000000000000LL;
> +    return (a.high & 0x7fff) == floatx80_default_inf.high &&
> +                       a.low == floatx80_default_inf.low;
>  }
>
>  static inline int floatx80_is_neg(floatx80 a)
> --
> 2.9.4
>
>