mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpu: use min/max values from stdint.h for integral overflow

Browse Source 
Remove some more use of LIT64 while making the meaning more clear. We
also avoid the need of casts as the results by definition fit into the
return type.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Alex Bennée 2019-08-13 11:55:32 +01:00
parent e6b405fe00
commit 2c217da0fc
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fpu/softfloat.c
View File

@ -3384,7 +3384,7 @@ static int32_t roundAndPackInt32(flag zSign, uint64_t absZ, float_status *status
if ( zSign ) z = - z; if ( zSign ) z = - z;
if ( ( absZ>>32 ) || ( z && ( ( z < 0 ) ^ zSign ) ) ) { if ( ( absZ>>32 ) || ( z && ( ( z < 0 ) ^ zSign ) ) ) {
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
return zSign ? (int32_t) 0x80000000 : 0x7FFFFFFF; return zSign ? INT32_MIN : INT32_MAX;
} }
if (roundBits) { if (roundBits) {
status->float_exception_flags |= float_flag_inexact; status->float_exception_flags |= float_flag_inexact;
@ -3444,9 +3444,7 @@ static int64_t roundAndPackInt64(flag zSign, uint64_t absZ0, uint64_t absZ1,
if ( z && ( ( z < 0 ) ^ zSign ) ) { if ( z && ( ( z < 0 ) ^ zSign ) ) {
overflow: overflow:
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
return return zSign ? INT64_MIN : INT64_MAX;
zSign ? (int64_t) LIT64( 0x8000000000000000 )
: LIT64( 0x7FFFFFFFFFFFFFFF );
} }
if (absZ1) { if (absZ1) {
status->float_exception_flags |= float_flag_inexact; status->float_exception_flags |= float_flag_inexact;
@ -3497,7 +3495,7 @@ static int64_t roundAndPackUint64(flag zSign, uint64_t absZ0,
++absZ0; ++absZ0;
if (absZ0 == 0) { if (absZ0 == 0) {
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
return LIT64(0xFFFFFFFFFFFFFFFF); return UINT64_MAX;
} }
absZ0 &= ~(((uint64_t)(absZ1<<1) == 0) & roundNearestEven); absZ0 &= ~(((uint64_t)(absZ1<<1) == 0) & roundNearestEven);
} }
@ -5518,9 +5516,9 @@ int64_t floatx80_to_int64(floatx80 a, float_status *status)
if ( shiftCount ) { if ( shiftCount ) {
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
if (!aSign || floatx80_is_any_nan(a)) { if (!aSign || floatx80_is_any_nan(a)) {
return LIT64( 0x7FFFFFFFFFFFFFFF ); return INT64_MAX;
} }
return (int64_t) LIT64( 0x8000000000000000 ); return INT64_MIN;
} }
aSigExtra = 0; aSigExtra = 0;
} }
@ -5561,10 +5559,10 @@ int64_t floatx80_to_int64_round_to_zero(floatx80 a, float_status *status)
if ( ( a.high != 0xC03E ) || aSig ) { if ( ( a.high != 0xC03E ) || aSig ) {
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
if ( ! aSign || ( ( aExp == 0x7FFF ) && aSig ) ) { if ( ! aSign || ( ( aExp == 0x7FFF ) && aSig ) ) {
return LIT64( 0x7FFFFFFFFFFFFFFF ); return INT64_MAX;
} }
} }
return (int64_t) LIT64( 0x8000000000000000 ); return INT64_MIN;
} }
else if ( aExp < 0x3FFF ) { else if ( aExp < 0x3FFF ) {
if (aExp | aSig) { if (aExp | aSig) {
@ -6623,7 +6621,7 @@ int32_t float128_to_int32_round_to_zero(float128 a, float_status *status)
if ( ( z < 0 ) ^ aSign ) { if ( ( z < 0 ) ^ aSign ) {
invalid: invalid:
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
return aSign ? (int32_t) 0x80000000 : 0x7FFFFFFF; return aSign ? INT32_MIN : INT32_MAX;
} }
if ( ( aSig0<<shiftCount ) != savedASig ) { if ( ( aSig0<<shiftCount ) != savedASig ) {
status->float_exception_flags |= float_flag_inexact; status->float_exception_flags |= float_flag_inexact;
@ -6662,9 +6660,9 @@ int64_t float128_to_int64(float128 a, float_status *status)
&& ( aSig1 || ( aSig0 != LIT64( 0x0001000000000000 ) ) ) && ( aSig1 || ( aSig0 != LIT64( 0x0001000000000000 ) ) )
) )
) { ) {
return LIT64( 0x7FFFFFFFFFFFFFFF ); return INT64_MAX;
} }
return (int64_t) LIT64( 0x8000000000000000 ); return INT64_MIN;
} }
shortShift128Left( aSig0, aSig1, - shiftCount, &aSig0, &aSig1 ); shortShift128Left( aSig0, aSig1, - shiftCount, &aSig0, &aSig1 );
} }
@ -6710,10 +6708,10 @@ int64_t float128_to_int64_round_to_zero(float128 a, float_status *status)
else { else {
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
if ( ! aSign || ( ( aExp == 0x7FFF ) && ( aSig0 | aSig1 ) ) ) { if ( ! aSign || ( ( aExp == 0x7FFF ) && ( aSig0 | aSig1 ) ) ) {
return LIT64( 0x7FFFFFFFFFFFFFFF ); return INT64_MAX;
} }
} }
return (int64_t) LIT64( 0x8000000000000000 ); return INT64_MIN;
} }
z = ( aSig0<<shiftCount ) | ( aSig1>>( ( - shiftCount ) & 63 ) ); z = ( aSig0<<shiftCount ) | ( aSig1>>( ( - shiftCount ) & 63 ) );
if ( (uint64_t) ( aSig1<<shiftCount ) ) { if ( (uint64_t) ( aSig1<<shiftCount ) ) {
@ -6764,19 +6762,19 @@ uint64_t float128_to_uint64(float128 a, float_status *status)
if (aSign && (aExp > 0x3FFE)) { if (aSign && (aExp > 0x3FFE)) {
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
if (float128_is_any_nan(a)) { if (float128_is_any_nan(a)) {
return LIT64(0xFFFFFFFFFFFFFFFF); return UINT64_MAX;
} else { } else {
return 0; return 0;
} }
} }
if (aExp) { if (aExp) {
aSig0 |= LIT64(0x0001000000000000); aSig0 |= UINT64_C(0x0001000000000000);
} }
shiftCount = 0x402F - aExp; shiftCount = 0x402F - aExp;
if (shiftCount <= 0) { if (shiftCount <= 0) {
if (0x403E < aExp) { if (0x403E < aExp) {
float_raise(float_flag_invalid, status); float_raise(float_flag_invalid, status);
return LIT64(0xFFFFFFFFFFFFFFFF); return UINT64_MAX;
} }
shortShift128Left(aSig0, aSig1, -shiftCount, &aSig0, &aSig1); shortShift128Left(aSig0, aSig1, -shiftCount, &aSig0, &aSig1);
} else { } else {