yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 00:35:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

softfloat: use floatx80_infinity in softfloat

Browse source 
Since f3218a8 ("softfloat: add floatx80 constants")
floatx80_infinity is defined but never used.

This patch updates floatx80 functions to use
this definition.

This allows to define a different default Infinity
value on m68k: the m68k FPU defines infinity with
all bits set to zero in the mantissa.

Backports commit 0f605c889ca3fe9744166ad4149d0dff6dacb696 from qemu
This commit is contained in:
Laurent Vivier 2018-03-09 01:33:15 -05:00 committed by Lioncash
parent 08c03a5de4
commit 5fa3a97549
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
17 changed files with 64 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qemu/aarch64.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_aarch64
#define floatx80_eq floatx80_eq_aarch64
#define floatx80_eq_quiet floatx80_eq_quiet_aarch64
#define floatx80_infinity floatx80_infinity_aarch64
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_aarch64
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_aarch64
#define floatx80_le floatx80_le_aarch64

1
qemu/aarch64eb.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_aarch64eb
#define floatx80_eq floatx80_eq_aarch64eb
#define floatx80_eq_quiet floatx80_eq_quiet_aarch64eb
#define floatx80_infinity floatx80_infinity_aarch64eb
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_aarch64eb
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_aarch64eb
#define floatx80_le floatx80_le_aarch64eb

1
qemu/arm.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_arm
#define floatx80_eq floatx80_eq_arm
#define floatx80_eq_quiet floatx80_eq_quiet_arm
#define floatx80_infinity floatx80_infinity_arm
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_arm
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_arm
#define floatx80_le floatx80_le_arm

1
qemu/armeb.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_armeb
#define floatx80_eq floatx80_eq_armeb
#define floatx80_eq_quiet floatx80_eq_quiet_armeb
#define floatx80_infinity floatx80_infinity_armeb
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_armeb
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_armeb
#define floatx80_le floatx80_le_armeb

14
qemu/fpu/softfloat-specialize.h
View file

@ -177,6 +177,20 @@ floatx80 floatx80_default_nan(float_status *status)
return r;
}
/*----------------------------------------------------------------------------
| The pattern for a default generated extended double-precision inf.
*----------------------------------------------------------------------------*/
#define floatx80_infinity_high 0x7FFF
#if defined(TARGET_M68K)
#define floatx80_infinity_low LIT64(0x0000000000000000)
#else
#define floatx80_infinity_low LIT64(0x8000000000000000)
#endif
const floatx80 floatx80_infinity
= make_floatx80_init(floatx80_infinity_high, floatx80_infinity_low);
/*----------------------------------------------------------------------------
| The pattern for a default generated quadruple-precision NaN.
*----------------------------------------------------------------------------*/

39
qemu/fpu/softfloat.c
View file

@ -2615,7 +2615,8 @@ floatx80 roundAndPackFloatx80(int8_t roundingPrecision, flag zSign,
) {
return packFloatx80( zSign, 0x7FFE, ~ roundMask );
}
return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
return packFloatx80(zSign, floatx80_infinity_high,
floatx80_infinity_low);
}
if ( zExp <= 0 ) {
isTiny =
@ -3150,7 +3151,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_infinity_high,
floatx80_infinity_low);
}
if ( aExp == 0 ) {
if ( aSig == 0 ) return packFloatx80( aSign, 0, 0 );
@ -4002,7 +4005,8 @@ 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_infinity_high,
floatx80_infinity_low);
}
if ( aExp == 0 ) {
if ( aSig == 0 ) return packFloatx80( aSign, 0, 0 );
@ -4513,10 +4517,7 @@ int64_t floatx80_to_int64(floatx80 a, float_status *status)
if ( shiftCount <= 0 ) {
if ( shiftCount ) {
float_raise(float_flag_invalid, status);
if ( ! aSign
|| ( ( aExp == 0x7FFF )
&& ( aSig != LIT64( 0x8000000000000000 ) ) )
) {
if (!aSign || floatx80_is_any_nan(a)) {
return LIT64( 0x7FFFFFFFFFFFFFFF );
}
return (int64_t) LIT64( 0x8000000000000000 );
@ -4819,7 +4820,9 @@ static floatx80 addFloatx80Sigs(floatx80 a, floatx80 b, flag zSign, float_status
else if ( expDiff < 0 ) {
if ( bExp == 0x7FFF ) {
if ( (uint64_t) ( bSig<<1 ) ) return propagateFloatx80NaN(a, b, status);
return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
return packFloatx80(zSign,
floatx80_infinity_high,
floatx80_infinity_low);
}
if ( aExp == 0 ) ++expDiff;
shift64ExtraRightJamming( aSig, 0, - expDiff, &aSig, &zSig1 );
@ -4893,7 +4896,8 @@ static floatx80 subFloatx80Sigs(floatx80 a, floatx80 b, flag zSign, float_status
bExpBigger:
if ( bExp == 0x7FFF ) {
if ( (uint64_t) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b, status );
return packFloatx80( zSign ^ 1, 0x7FFF, LIT64( 0x8000000000000000 ) );
return packFloatx80(zSign ^ 1, floatx80_infinity_high,
floatx80_infinity_low);
}
if ( aExp == 0 ) ++expDiff;
shift128RightJamming( aSig, 0, - expDiff, &aSig, &zSig1 );
@ -4998,7 +5002,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_infinity_high,
floatx80_infinity_low);
}
if ( bExp == 0x7FFF ) {
if ( (uint64_t) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b, status );
@ -5007,7 +5012,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_infinity_high,
floatx80_infinity_low);
}
if ( aExp == 0 ) {
if ( aSig == 0 ) return packFloatx80( zSign, 0, 0 );
@ -5059,7 +5065,8 @@ floatx80 floatx80_div(floatx80 a, floatx80 b, float_status *status)
if ( (uint64_t) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b, status );
goto invalid;
}
return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
return packFloatx80(zSign, floatx80_infinity_high,
floatx80_infinity_low);
}
if ( bExp == 0x7FFF ) {
if ( (uint64_t) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b, status );
@ -5073,7 +5080,9 @@ 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_infinity_high,
floatx80_infinity_low);
}
normalizeFloatx80Subnormal( bSig, &bExp, &bSig );
}
@ -5892,7 +5901,9 @@ 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_infinity_high,
floatx80_infinity_low);
}
if ( aExp == 0 ) {
if ( ( aSig0 | aSig1 ) == 0 ) return packFloatx80( aSign, 0, 0 );

1
qemu/header_gen.py
View file

@ -656,6 +656,7 @@ symbols = (
'floatx80_div',
'floatx80_eq',
'floatx80_eq_quiet',
'floatx80_infinity',
'floatx80_is_quiet_nan',
'floatx80_is_signaling_nan',
'floatx80_le',

13
qemu/include/fpu/softfloat.h
View file

@ -579,6 +579,11 @@ float32 floatx80_to_float32(floatx80, float_status *status);
float64 floatx80_to_float64(floatx80, float_status *status);
float128 floatx80_to_float128(floatx80, float_status *status);
/*----------------------------------------------------------------------------
| The pattern for an extended double-precision inf.
*----------------------------------------------------------------------------*/
extern const floatx80 floatx80_infinity;
/*----------------------------------------------------------------------------
| Software IEC/IEEE extended double-precision operations.
*----------------------------------------------------------------------------*/
@ -619,7 +624,12 @@ static inline floatx80 floatx80_chs(floatx80 a)
static inline int floatx80_is_infinity(floatx80 a)
{
return (a.high & 0x7fff) == 0x7fff && a.low == 0x8000000000000000LL;
#if defined(TARGET_M68K)
return (a.high & 0x7fff) == floatx80_infinity.high && !(a.low << 1);
#else
return (a.high & 0x7fff) == floatx80_infinity.high &&
a.low == floatx80_infinity.low;
#endif
}
static inline int floatx80_is_neg(floatx80 a)
@ -662,7 +672,6 @@ static inline bool floatx80_invalid_encoding(floatx80 a)
#define floatx80_ln2 make_floatx80(0x3ffe, 0xb17217f7d1cf79acLL)
#define floatx80_pi make_floatx80(0x4000, 0xc90fdaa22168c235LL)
#define floatx80_half make_floatx80(0x3ffe, 0x8000000000000000LL)
#define floatx80_infinity make_floatx80(0x7fff, 0x8000000000000000LL)
/*----------------------------------------------------------------------------
| Returns the fraction bits of the extended double-precision floating-point

1
qemu/m68k.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_m68k
#define floatx80_eq floatx80_eq_m68k
#define floatx80_eq_quiet floatx80_eq_quiet_m68k
#define floatx80_infinity floatx80_infinity_m68k
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_m68k
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_m68k
#define floatx80_le floatx80_le_m68k

1
qemu/mips.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_mips
#define floatx80_eq floatx80_eq_mips
#define floatx80_eq_quiet floatx80_eq_quiet_mips
#define floatx80_infinity floatx80_infinity_mips
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_mips
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_mips
#define floatx80_le floatx80_le_mips

1
qemu/mips64.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_mips64
#define floatx80_eq floatx80_eq_mips64
#define floatx80_eq_quiet floatx80_eq_quiet_mips64
#define floatx80_infinity floatx80_infinity_mips64
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_mips64
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_mips64
#define floatx80_le floatx80_le_mips64

1
qemu/mips64el.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_mips64el
#define floatx80_eq floatx80_eq_mips64el
#define floatx80_eq_quiet floatx80_eq_quiet_mips64el
#define floatx80_infinity floatx80_infinity_mips64el
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_mips64el
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_mips64el
#define floatx80_le floatx80_le_mips64el

1
qemu/mipsel.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_mipsel
#define floatx80_eq floatx80_eq_mipsel
#define floatx80_eq_quiet floatx80_eq_quiet_mipsel
#define floatx80_infinity floatx80_infinity_mipsel
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_mipsel
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_mipsel
#define floatx80_le floatx80_le_mipsel

1
qemu/powerpc.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_powerpc
#define floatx80_eq floatx80_eq_powerpc
#define floatx80_eq_quiet floatx80_eq_quiet_powerpc
#define floatx80_infinity floatx80_infinity_powerpc
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_powerpc
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_powerpc
#define floatx80_le floatx80_le_powerpc

1
qemu/sparc.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_sparc
#define floatx80_eq floatx80_eq_sparc
#define floatx80_eq_quiet floatx80_eq_quiet_sparc
#define floatx80_infinity floatx80_infinity_sparc
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_sparc
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_sparc
#define floatx80_le floatx80_le_sparc

1
qemu/sparc64.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_sparc64
#define floatx80_eq floatx80_eq_sparc64
#define floatx80_eq_quiet floatx80_eq_quiet_sparc64
#define floatx80_infinity floatx80_infinity_sparc64
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_sparc64
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_sparc64
#define floatx80_le floatx80_le_sparc64

1
qemu/x86_64.h
View file

@ -650,6 +650,7 @@
#define floatx80_div floatx80_div_x86_64
#define floatx80_eq floatx80_eq_x86_64
#define floatx80_eq_quiet floatx80_eq_quiet_x86_64
#define floatx80_infinity floatx80_infinity_x86_64
#define floatx80_is_quiet_nan floatx80_is_quiet_nan_x86_64
#define floatx80_is_signaling_nan floatx80_is_signaling_nan_x86_64
#define floatx80_le floatx80_le_x86_64