diff options
author | Joseph Myers <joseph@codesourcery.com> | 2015-10-05 17:46:50 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2015-10-05 17:46:50 +0000 |
commit | bc3753638a1c3c93dea071414909ce2729e3ca50 (patch) | |
tree | 220d602aa00397fc2b472dc4b38f168865ff5ef7 /sysdeps/ieee754/dbl-64 | |
parent | 57352c2201678ee52e7e8ea6fb6e115a9ec4e711 (diff) | |
download | glibc-bc3753638a1c3c93dea071414909ce2729e3ca50.zip glibc-bc3753638a1c3c93dea071414909ce2729e3ca50.tar.gz glibc-bc3753638a1c3c93dea071414909ce2729e3ca50.tar.bz2 |
Work around powerpc32 integer 0 converting to -0 (bug 887, bug 19049, bug 19050).
On powerpc32 hard-float, older processors (ones where fcfid is not
available for 32-bit code), GCC generates conversions from integers to
floating point that wrongly convert integer 0 to -0 instead of +0 in
FE_DOWNWARD mode. This in turn results in logb and a few other
functions wrongly returning -0 when they should return +0.
This patch works around this issue in glibc as I proposed in
<https://sourceware.org/ml/libc-alpha/2015-09/msg00728.html>, so that
the affected functions can be correct and the affected tests pass in
the absence of a GCC fix for this longstanding issue (GCC bug 67771 -
if fixed, of course we can put in GCC version conditionals, and
eventually phase out the workarounds). A new macro
FIX_INT_FP_CONVERT_ZERO is added in a new sysdeps header
fix-int-fp-convert-zero.h, and the powerpc32/fpu version of that
header defines the macro based on the results of a configure test for
whether such conversions use the fcfid instruction.
Tested for x86_64 (that installed stripped shared libraries are
unchanged by the patch) and powerpc (that HAVE_PPC_FCFID comes out to
0 as expected and that the relevant tests are fixed). Also tested a
build with GCC configured for -mcpu=power4 and verified that
HAVE_PPC_FCFID comes out to 1 in that case.
There are still some other issues to fix to get test-float and
test-double passing cleanly for older powerpc32 processors (apart from
the need for an ulps regeneration for powerpc). (test-ldouble will be
harder to get passing cleanly, but with a combination of selected
fixes to ldbl-128ibm code that don't involve significant performance
issues, allowing spurious underflow and inexact exceptions for that
format, and lots of XFAILing for the default case of unpatched libgcc,
it should be doable.)
[BZ #887]
[BZ #19049]
[BZ #19050]
* sysdeps/generic/fix-int-fp-convert-zero.h: New file.
* sysdeps/ieee754/dbl-64/e_log10.c: Include
<fix-int-fp-convert-zero.h>.
(__ieee754_log10): Adjust signs as needed if FIX_INT_FP_CONVERT_ZERO.
* sysdeps/ieee754/dbl-64/e_log2.c: Include
<fix-int-fp-convert-zero.h>.
(__ieee754_log2): Adjust signs as needed if FIX_INT_FP_CONVERT_ZERO.
* sysdeps/ieee754/dbl-64/s_erf.c: Include
<fix-int-fp-convert-zero.h>.
(__erfc): Adjust signs as needed if FIX_INT_FP_CONVERT_ZERO.
* sysdeps/ieee754/dbl-64/s_logb.c: Include
<fix-int-fp-convert-zero.h>.
(__logb): Adjust signs as needed if FIX_INT_FP_CONVERT_ZERO.
* sysdeps/ieee754/flt-32/e_log10f.c: Include
<fix-int-fp-convert-zero.h>.
(__ieee754_log10f): Adjust signs as needed if FIX_INT_FP_CONVERT_ZERO.
* sysdeps/ieee754/flt-32/e_log2f.c: Include
<fix-int-fp-convert-zero.h>.
(__ieee754_log2f): Adjust signs as needed if FIX_INT_FP_CONVERT_ZERO.
* sysdeps/ieee754/flt-32/s_erff.c: Include
<fix-int-fp-convert-zero.h>.
(__erfcf): Adjust signs as needed if FIX_INT_FP_CONVERT_ZERO.
* sysdeps/ieee754/flt-32/s_logbf.c: Include
<fix-int-fp-convert-zero.h>.
(__logbf): Adjust signs as needed if FIX_INT_FP_CONVERT_ZERO.
* sysdeps/ieee754/ldbl-128ibm/s_erfl.c: Include
<fix-int-fp-convert-zero.h>.
(__erfcl): Adjust signs as needed if FIX_INT_FP_CONVERT_ZERO.
* sysdeps/ieee754/ldbl-128ibm/s_logbl.c: Include
<fix-int-fp-convert-zero.h>.
(__logbl): Adjust signs as needed if FIX_INT_FP_CONVERT_ZERO.
* sysdeps/powerpc/powerpc32/fpu/configure.ac: New file.
* sysdeps/powerpc/powerpc32/fpu/configure: New generated file.
* sysdeps/powerpc/powerpc32/fpu/fix-int-fp-convert-zero.h: New
file.
* config.h.in [_LIBC] (HAVE_PPC_FCFID): New macro.
Diffstat (limited to 'sysdeps/ieee754/dbl-64')
-rw-r--r-- | sysdeps/ieee754/dbl-64/e_log10.c | 3 | ||||
-rw-r--r-- | sysdeps/ieee754/dbl-64/e_log2.c | 7 | ||||
-rw-r--r-- | sysdeps/ieee754/dbl-64/s_erf.c | 6 | ||||
-rw-r--r-- | sysdeps/ieee754/dbl-64/s_logb.c | 3 |
4 files changed, 17 insertions, 2 deletions
diff --git a/sysdeps/ieee754/dbl-64/e_log10.c b/sysdeps/ieee754/dbl-64/e_log10.c index 8548ee3..df59d9d 100644 --- a/sysdeps/ieee754/dbl-64/e_log10.c +++ b/sysdeps/ieee754/dbl-64/e_log10.c @@ -45,6 +45,7 @@ #include <math.h> #include <math_private.h> +#include <fix-int-fp-convert-zero.h> static const double two54 = 1.80143985094819840000e+16; /* 0x43500000, 0x00000000 */ static const double ivln10 = 4.34294481903251816668e-01; /* 0x3FDBCB7B, 0x1526E50E */ @@ -77,6 +78,8 @@ __ieee754_log10 (double x) i = ((u_int32_t) k & 0x80000000) >> 31; hx = (hx & 0x000fffff) | ((0x3ff - i) << 20); y = (double) (k + i); + if (FIX_INT_FP_CONVERT_ZERO && y == 0.0) + y = 0.0; SET_HIGH_WORD (x, hx); z = y * log10_2lo + ivln10 * __ieee754_log (x); return z + y * log10_2hi; diff --git a/sysdeps/ieee754/dbl-64/e_log2.c b/sysdeps/ieee754/dbl-64/e_log2.c index 997d7ce..bc6a341 100644 --- a/sysdeps/ieee754/dbl-64/e_log2.c +++ b/sysdeps/ieee754/dbl-64/e_log2.c @@ -56,6 +56,7 @@ #include <math.h> #include <math_private.h> +#include <fix-int-fp-convert-zero.h> static const double ln2 = 0.69314718055994530942; static const double two54 = 1.80143985094819840000e+16; /* 43500000 00000000 */ @@ -101,7 +102,11 @@ __ieee754_log2 (double x) if ((0x000fffff & (2 + hx)) < 3) { /* |f| < 2**-20 */ if (f == zero) - return dk; + { + if (FIX_INT_FP_CONVERT_ZERO && dk == 0.0) + dk = 0.0; + return dk; + } R = f * f * (0.5 - 0.33333333333333333 * f); return dk - (R - f) / ln2; } diff --git a/sysdeps/ieee754/dbl-64/s_erf.c b/sysdeps/ieee754/dbl-64/s_erf.c index e59f5f3..b4975a8 100644 --- a/sysdeps/ieee754/dbl-64/s_erf.c +++ b/sysdeps/ieee754/dbl-64/s_erf.c @@ -116,6 +116,7 @@ static char rcsid[] = "$NetBSD: s_erf.c,v 1.8 1995/05/10 20:47:05 jtc Exp $"; #include <float.h> #include <math.h> #include <math_private.h> +#include <fix-int-fp-convert-zero.h> static const double tiny = 1e-300, @@ -308,7 +309,10 @@ __erfc (double x) ix = hx & 0x7fffffff; if (ix >= 0x7ff00000) /* erfc(nan)=nan */ { /* erfc(+-inf)=0,2 */ - return (double) (((u_int32_t) hx >> 31) << 1) + one / x; + double ret = (double) (((u_int32_t) hx >> 31) << 1) + one / x; + if (FIX_INT_FP_CONVERT_ZERO && ret == 0.0) + return 0.0; + return ret; } if (ix < 0x3feb0000) /* |x|<0.84375 */ diff --git a/sysdeps/ieee754/dbl-64/s_logb.c b/sysdeps/ieee754/dbl-64/s_logb.c index 7a6c49a..3a26b18 100644 --- a/sysdeps/ieee754/dbl-64/s_logb.c +++ b/sysdeps/ieee754/dbl-64/s_logb.c @@ -18,6 +18,7 @@ #include <math.h> #include <math_private.h> +#include <fix-int-fp-convert-zero.h> double __logb (double x) @@ -41,6 +42,8 @@ __logb (double x) ma = __builtin_clz (ix); rix -= ma - 12; } + if (FIX_INT_FP_CONVERT_ZERO && rix == 1023) + return 0.0; return (double) (rix - 1023); } weak_alias (__logb, logb) |