Commit d619bb98 authored by Richard Henderson's avatar Richard Henderson
Browse files

fpu/softfloat: Split floatXX_silence_nan from floatXX_maybe_silence_nan 



The new function assumes that the input is an SNaN and
does not double-check.

Tested-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent bca52234

fpu/softfloat-specialize.h

+118 −56
Original line number Diff line number Diff line
@@ -272,21 +272,34 @@ int float16_is_signaling_nan(float16 a_, float_status *status) 
}



/*----------------------------------------------------------------------------

| Returns a quiet NaN if the half-precision floating point value `a' is a

| signaling NaN; otherwise returns `a'.

| Returns a quiet NaN from a signalling NaN for the half-precision

| floating point value `a'.

*----------------------------------------------------------------------------*/

float16 float16_maybe_silence_nan(float16 a_, float_status *status)



float16 float16_silence_nan(float16 a, float_status *status)

{

    if (float16_is_signaling_nan(a_, status)) {

#ifdef NO_SIGNALING_NANS

    g_assert_not_reached();

#else

    if (status->snan_bit_is_one) {

        return float16_default_nan(status);

    } else {

            uint16_t a = float16_val(a_);

            a |= (1 << 9);

            return make_float16(a);

        return a | (1 << 9);

    }

#endif

}



/*----------------------------------------------------------------------------

| Returns a quiet NaN if the half-precision floating point value `a' is a

| signaling NaN; otherwise returns `a'.

*----------------------------------------------------------------------------*/



float16 float16_maybe_silence_nan(float16 a, float_status *status)

{

    if (float16_is_signaling_nan(a, status)) {

        return float16_silence_nan(a, status);

    }

    return a_;

    return a;

}



/*----------------------------------------------------------------------------
@@ -368,29 +381,39 @@ int float32_is_signaling_nan(float32 a_, float_status *status) 
}



/*----------------------------------------------------------------------------

| Returns a quiet NaN if the single-precision floating point value `a' is a

| signaling NaN; otherwise returns `a'.

| Returns a quiet NaN from a signalling NaN for the single-precision

| floating point value `a'.

*----------------------------------------------------------------------------*/



float32 float32_maybe_silence_nan(float32 a_, float_status *status)

float32 float32_silence_nan(float32 a, float_status *status)

{

    if (float32_is_signaling_nan(a_, status)) {

#ifdef NO_SIGNALING_NANS

    g_assert_not_reached();

#else

    if (status->snan_bit_is_one) {

# ifdef TARGET_HPPA

            uint32_t a = float32_val(a_);

        a &= ~0x00400000;

        a |=  0x00200000;

            return make_float32(a);

        return a;

# else

        return float32_default_nan(status);

# endif

    } else {

            uint32_t a = float32_val(a_);

            a |= (1 << 22);

            return make_float32(a);

        return a | (1 << 22);

    }

#endif

}

/*----------------------------------------------------------------------------

| Returns a quiet NaN if the single-precision floating point value `a' is a

| signaling NaN; otherwise returns `a'.

*----------------------------------------------------------------------------*/



float32 float32_maybe_silence_nan(float32 a, float_status *status)

{

    if (float32_is_signaling_nan(a, status)) {

        return float32_silence_nan(a, status);

    }

    return a_;

    return a;

}



/*----------------------------------------------------------------------------
@@ -777,29 +800,40 @@ int float64_is_signaling_nan(float64 a_, float_status *status) 
}



/*----------------------------------------------------------------------------

| Returns a quiet NaN if the double-precision floating point value `a' is a

| signaling NaN; otherwise returns `a'.

| Returns a quiet NaN from a signalling NaN for the double-precision

| floating point value `a'.

*----------------------------------------------------------------------------*/



float64 float64_maybe_silence_nan(float64 a_, float_status *status)

float64 float64_silence_nan(float64 a, float_status *status)

{

    if (float64_is_signaling_nan(a_, status)) {

#ifdef NO_SIGNALING_NANS

    g_assert_not_reached();

#else

    if (status->snan_bit_is_one) {

# ifdef TARGET_HPPA

            uint64_t a = float64_val(a_);

        a &= ~0x0008000000000000ULL;

        a |=  0x0004000000000000ULL;

            return make_float64(a);

        return a;

# else

        return float64_default_nan(status);

# endif

    } else {

            uint64_t a = float64_val(a_);

            a |= LIT64(0x0008000000000000);

            return make_float64(a);

        return a | LIT64(0x0008000000000000);

    }

#endif

}



/*----------------------------------------------------------------------------

| Returns a quiet NaN if the double-precision floating point value `a' is a

| signaling NaN; otherwise returns `a'.

*----------------------------------------------------------------------------*/



float64 float64_maybe_silence_nan(float64 a, float_status *status)

{

    if (float64_is_signaling_nan(a, status)) {

        return float64_silence_nan(a, status);

    }

    return a_;

    return a;

}



/*----------------------------------------------------------------------------
@@ -938,19 +972,33 @@ int floatx80_is_signaling_nan(floatx80 a, float_status *status) 
}



/*----------------------------------------------------------------------------

| Returns a quiet NaN if the extended double-precision floating point value

| `a' is a signaling NaN; otherwise returns `a'.

| Returns a quiet NaN from a signalling NaN for the extended double-precision

| floating point value `a'.

*----------------------------------------------------------------------------*/



floatx80 floatx80_maybe_silence_nan(floatx80 a, float_status *status)

floatx80 floatx80_silence_nan(floatx80 a, float_status *status)

{

    if (floatx80_is_signaling_nan(a, status)) {

#ifdef NO_SIGNALING_NANS

    g_assert_not_reached();

#else

    if (status->snan_bit_is_one) {

            a = floatx80_default_nan(status);

        return floatx80_default_nan(status);

    } else {

        a.low |= LIT64(0xC000000000000000);

        return a;

    }

#endif

}



/*----------------------------------------------------------------------------

| Returns a quiet NaN if the extended double-precision floating point value

| `a' is a signaling NaN; otherwise returns `a'.

*----------------------------------------------------------------------------*/



floatx80 floatx80_maybe_silence_nan(floatx80 a, float_status *status)

{

    if (floatx80_is_signaling_nan(a, status)) {

        return floatx80_silence_nan(a, status);

    }

    return a;

}
@@ -1085,19 +1133,33 @@ int float128_is_signaling_nan(float128 a, float_status *status) 
}



/*----------------------------------------------------------------------------

| Returns a quiet NaN if the quadruple-precision floating point value `a' is

| a signaling NaN; otherwise returns `a'.

| Returns a quiet NaN from a signalling NaN for the quadruple-precision

| floating point value `a'.

*----------------------------------------------------------------------------*/



float128 float128_maybe_silence_nan(float128 a, float_status *status)

float128 float128_silence_nan(float128 a, float_status *status)

{

    if (float128_is_signaling_nan(a, status)) {

#ifdef NO_SIGNALING_NANS

    g_assert_not_reached();

#else

    if (status->snan_bit_is_one) {

            a = float128_default_nan(status);

        return float128_default_nan(status);

    } else {

        a.high |= LIT64(0x0000800000000000);

        return a;

    }

#endif

}



/*----------------------------------------------------------------------------

| Returns a quiet NaN if the quadruple-precision floating point value `a' is

| a signaling NaN; otherwise returns `a'.

*----------------------------------------------------------------------------*/



float128 float128_maybe_silence_nan(float128 a, float_status *status)

{

    if (float128_is_signaling_nan(a, status)) {

        return float128_silence_nan(a, status);

    }

    return a;

}

include/fpu/softfloat.h

+5 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ int float16_compare_quiet(float16, float16, float_status *status); 


int float16_is_quiet_nan(float16, float_status *status);

int float16_is_signaling_nan(float16, float_status *status);

float16 float16_silence_nan(float16, float_status *status);

float16 float16_maybe_silence_nan(float16, float_status *status);



static inline int float16_is_any_nan(float16 a)
@@ -368,6 +369,7 @@ float32 float32_minnummag(float32, float32, float_status *status); 
float32 float32_maxnummag(float32, float32, float_status *status);

int float32_is_quiet_nan(float32, float_status *status);

int float32_is_signaling_nan(float32, float_status *status);

float32 float32_silence_nan(float32, float_status *status);

float32 float32_maybe_silence_nan(float32, float_status *status);

float32 float32_scalbn(float32, int, float_status *status);
@@ -497,6 +499,7 @@ float64 float64_minnummag(float64, float64, float_status *status); 
float64 float64_maxnummag(float64, float64, float_status *status);

int float64_is_quiet_nan(float64 a, float_status *status);

int float64_is_signaling_nan(float64, float_status *status);

float64 float64_silence_nan(float64, float_status *status);

float64 float64_maybe_silence_nan(float64, float_status *status);

float64 float64_scalbn(float64, int, float_status *status);
@@ -600,6 +603,7 @@ int floatx80_compare(floatx80, floatx80, float_status *status); 
int floatx80_compare_quiet(floatx80, floatx80, float_status *status);

int floatx80_is_quiet_nan(floatx80, float_status *status);

int floatx80_is_signaling_nan(floatx80, float_status *status);

floatx80 floatx80_silence_nan(floatx80, float_status *status);

floatx80 floatx80_maybe_silence_nan(floatx80, float_status *status);

floatx80 floatx80_scalbn(floatx80, int, float_status *status);
@@ -811,6 +815,7 @@ int float128_compare(float128, float128, float_status *status); 
int float128_compare_quiet(float128, float128, float_status *status);

int float128_is_quiet_nan(float128, float_status *status);

int float128_is_signaling_nan(float128, float_status *status);

float128 float128_silence_nan(float128, float_status *status);

float128 float128_maybe_silence_nan(float128, float_status *status);

float128 float128_scalbn(float128, int, float_status *status);