Use trunc functions not __trunc functions in glibc libm.
authorJoseph Myers <joseph@codesourcery.com>
Thu, 20 Sep 2018 21:11:10 +0000 (21:11 +0000)
committerJoseph Myers <joseph@codesourcery.com>
Thu, 20 Sep 2018 21:11:10 +0000 (21:11 +0000)
Continuing the move to use, within libm, public names for libm
functions that can be inlined as built-in functions on many
architectures, this patch moves calls to __trunc functions to call the
corresponding trunc names instead, with asm redirection to __trunc
when the calls are not inlined.

Tested for x86_64, and with build-many-glibcs.py.

* include/math.h [!_ISOMAC && !(__FINITE_MATH_ONLY__ &&
__FINITE_MATH_ONLY__ > 0) && !NO_MATH_REDIRECT] (trunc): Redirect
using MATH_REDIRECT.
* sysdeps/aarch64/fpu/s_trunc.c: Define NO_MATH_REDIRECT before
header inclusion.
* sysdeps/aarch64/fpu/s_truncf.c: Likewise.
* sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c: Likewise.
* sysdeps/ieee754/float128/s_truncf128.c: Likewise.
* sysdeps/ieee754/dbl-64/s_trunc.c: Likewise.
* sysdeps/ieee754/flt-32/s_truncf.c: Likewise.
* sysdeps/ieee754/ldbl-128/s_truncl.c: Likewise.
* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_trunc.c: Likewise.
* sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_truncf.c: Likewise.
* sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.c: Likewise.
* sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.c: Likewise.
* sysdeps/riscv/rv64/rvd/s_trunc.c: Likewise.
* sysdeps/riscv/rvf/s_truncf.c: Likewise.
* sysdeps/sparc/sparc64/fpu/multiarch/s_trunc.c: Likewise.
* sysdeps/sparc/sparc64/fpu/multiarch/s_truncf.c: Likewise.
* sysdeps/x86_64/fpu/multiarch/s_trunc.c: Likewise.
* sysdeps/x86_64/fpu/multiarch/s_truncf.c: Likewise.
* sysdeps/m68k/m680x0/fpu/s_trunc_template.c: Likewise.
* sysdeps/ieee754/ldbl-128ibm/s_truncl.c: Likewise.
(ceil): Redirect to __ceil.
(floor): Redirect to __floor.
(trunc): Redirect to __trunc.
(__truncl): Call trunc instead of __trunc.
* sysdeps/powerpc/fpu/math_private.h [_ARCH_PWR5X] (__trunc):
Remove macro.
[_ARCH_PWR5X] (__truncf): Likewise.
* sysdeps/ieee754/dbl-64/e_gamma_r.c (__ieee754_gamma_r): Use
trunc functions instead of __trunc variants.
* sysdeps/ieee754/flt-32/e_gammaf_r.c (__ieee754_gammaf_r):
Likewise.
* sysdeps/ieee754/ldbl-128/e_gammal_r.c (__ieee754_gammal_r):
Likewise.
* sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c (__ieee754_gammal_r):
Likewise.
* sysdeps/ieee754/ldbl-96/e_gammal_r.c (__ieee754_gammal_r):
Likewise.

27 files changed:
ChangeLog
include/math.h
sysdeps/aarch64/fpu/s_trunc.c
sysdeps/aarch64/fpu/s_truncf.c
sysdeps/ieee754/dbl-64/e_gamma_r.c
sysdeps/ieee754/dbl-64/s_trunc.c
sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c
sysdeps/ieee754/float128/s_truncf128.c
sysdeps/ieee754/flt-32/e_gammaf_r.c
sysdeps/ieee754/flt-32/s_truncf.c
sysdeps/ieee754/ldbl-128/e_gammal_r.c
sysdeps/ieee754/ldbl-128/s_truncl.c
sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c
sysdeps/ieee754/ldbl-128ibm/s_truncl.c
sysdeps/ieee754/ldbl-96/e_gammal_r.c
sysdeps/m68k/m680x0/fpu/s_trunc_template.c
sysdeps/powerpc/fpu/math_private.h
sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_trunc.c
sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_truncf.c
sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.c
sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.c
sysdeps/riscv/rv64/rvd/s_trunc.c
sysdeps/riscv/rvf/s_truncf.c
sysdeps/sparc/sparc64/fpu/multiarch/s_trunc.c
sysdeps/sparc/sparc64/fpu/multiarch/s_truncf.c
sysdeps/x86_64/fpu/multiarch/s_trunc.c
sysdeps/x86_64/fpu/multiarch/s_truncf.c

index fc3fbff..dfb9dc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,46 @@
 2018-09-20  Joseph Myers  <joseph@codesourcery.com>
 
+       * include/math.h [!_ISOMAC && !(__FINITE_MATH_ONLY__ &&
+       __FINITE_MATH_ONLY__ > 0) && !NO_MATH_REDIRECT] (trunc): Redirect
+       using MATH_REDIRECT.
+       * sysdeps/aarch64/fpu/s_trunc.c: Define NO_MATH_REDIRECT before
+       header inclusion.
+       * sysdeps/aarch64/fpu/s_truncf.c: Likewise.
+       * sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c: Likewise.
+       * sysdeps/ieee754/float128/s_truncf128.c: Likewise.
+       * sysdeps/ieee754/dbl-64/s_trunc.c: Likewise.
+       * sysdeps/ieee754/flt-32/s_truncf.c: Likewise.
+       * sysdeps/ieee754/ldbl-128/s_truncl.c: Likewise.
+       * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_trunc.c: Likewise.
+       * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_truncf.c: Likewise.
+       * sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.c: Likewise.
+       * sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.c: Likewise.
+       * sysdeps/riscv/rv64/rvd/s_trunc.c: Likewise.
+       * sysdeps/riscv/rvf/s_truncf.c: Likewise.
+       * sysdeps/sparc/sparc64/fpu/multiarch/s_trunc.c: Likewise.
+       * sysdeps/sparc/sparc64/fpu/multiarch/s_truncf.c: Likewise.
+       * sysdeps/x86_64/fpu/multiarch/s_trunc.c: Likewise.
+       * sysdeps/x86_64/fpu/multiarch/s_truncf.c: Likewise.
+       * sysdeps/m68k/m680x0/fpu/s_trunc_template.c: Likewise.
+       * sysdeps/ieee754/ldbl-128ibm/s_truncl.c: Likewise.
+       (ceil): Redirect to __ceil.
+       (floor): Redirect to __floor.
+       (trunc): Redirect to __trunc.
+       (__truncl): Call trunc instead of __trunc.
+       * sysdeps/powerpc/fpu/math_private.h [_ARCH_PWR5X] (__trunc):
+       Remove macro.
+       [_ARCH_PWR5X] (__truncf): Likewise.
+       * sysdeps/ieee754/dbl-64/e_gamma_r.c (__ieee754_gamma_r): Use
+       trunc functions instead of __trunc variants.
+       * sysdeps/ieee754/flt-32/e_gammaf_r.c (__ieee754_gammaf_r):
+       Likewise.
+       * sysdeps/ieee754/ldbl-128/e_gammal_r.c (__ieee754_gammal_r):
+       Likewise.
+       * sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c (__ieee754_gammal_r):
+       Likewise.
+       * sysdeps/ieee754/ldbl-96/e_gammal_r.c (__ieee754_gammal_r):
+       Likewise.
+
        * sysdeps/x86/cpu-features.h [__geode__ || __k6__]: Handle like
        [__i586__ || __pentium__].
        [__i486__]: Handle explicitly.
index e96f971..f8482af 100644 (file)
@@ -104,6 +104,7 @@ MATH_REDIRECT (sqrt, "__ieee754_", MATH_REDIRECT_UNARY_ARGS)
 MATH_REDIRECT (ceil, "__", MATH_REDIRECT_UNARY_ARGS)
 MATH_REDIRECT (floor, "__", MATH_REDIRECT_UNARY_ARGS)
 MATH_REDIRECT (rint, "__", MATH_REDIRECT_UNARY_ARGS)
+MATH_REDIRECT (trunc, "__", MATH_REDIRECT_UNARY_ARGS)
 #  endif
 # endif
 
index 22f44f1..929448e 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <libm-alias-double.h>
 
index 3771b6d..242ea77 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <libm-alias-float.h>
 
index 823ffdb..2cfe6d6 100644 (file)
@@ -173,8 +173,8 @@ __ieee754_gamma_r (double x, int *signgamp)
        }
       else
        {
-         double tx = __trunc (x);
-         *signgamp = (tx == 2.0 * __trunc (tx / 2.0)) ? -1 : 1;
+         double tx = trunc (x);
+         *signgamp = (tx == 2.0 * trunc (tx / 2.0)) ? -1 : 1;
          if (x <= -184.0)
            /* Underflow.  */
            ret = DBL_MIN * DBL_MIN;
index 6ffabb4..d9894b2 100644 (file)
@@ -17,6 +17,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 
 #include <math_private.h>
index 19a09b8..f7e2255 100644 (file)
@@ -17,6 +17,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 
 #include <math_private.h>
index 474d9dc..5786cfe 100644 (file)
@@ -1,2 +1,3 @@
+#define NO_MATH_REDIRECT
 #include <float128_private.h>
 #include "../ldbl-128/s_truncl.c"
index 68f8f44..7d9a6cb 100644 (file)
@@ -165,8 +165,8 @@ __ieee754_gammaf_r (float x, int *signgamp)
        }
       else
        {
-         float tx = __truncf (x);
-         *signgamp = (tx == 2.0f * __truncf (tx / 2.0f)) ? -1 : 1;
+         float tx = truncf (x);
+         *signgamp = (tx == 2.0f * truncf (tx / 2.0f)) ? -1 : 1;
          if (x <= -42.0f)
            /* Underflow.  */
            ret = FLT_MIN * FLT_MIN;
index 2e1464a..7ef067e 100644 (file)
@@ -17,6 +17,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 
 #include <math_private.h>
index f620463..184798f 100644 (file)
@@ -179,8 +179,8 @@ __ieee754_gammal_r (_Float128 x, int *signgamp)
        }
       else
        {
-         _Float128 tx = __truncl (x);
-         *signgamp = (tx == 2 * __truncl (tx / 2)) ? -1 : 1;
+         _Float128 tx = truncl (x);
+         *signgamp = (tx == 2 * truncl (tx / 2)) ? -1 : 1;
          if (x <= -1775)
            /* Underflow.  */
            ret = LDBL_MIN * LDBL_MIN;
index f858ede..2dc01e7 100644 (file)
@@ -18,6 +18,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 
 #include <math_private.h>
index c1e0efa..3680121 100644 (file)
@@ -179,8 +179,8 @@ __ieee754_gammal_r (long double x, int *signgamp)
        }
       else
        {
-         long double tx = __truncl (x);
-         *signgamp = (tx == 2.0L * __truncl (tx / 2.0L)) ? -1 : 1;
+         long double tx = truncl (x);
+         *signgamp = (tx == 2.0L * truncl (tx / 2.0L)) ? -1 : 1;
          if (x <= -191.0L)
            /* Underflow.  */
            ret = LDBL_MIN * LDBL_MIN;
index 9646567..3d658d3 100644 (file)
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_private.h>
 #include <math_ldbl_opt.h>
 #include <float.h>
 #include <ieee754.h>
 
+double ceil (double) asm ("__ceil");
+double floor (double) asm ("__floor");
+double trunc (double) asm ("__trunc");
+
 
 long double
 __truncl (long double x)
@@ -36,7 +41,7 @@ __truncl (long double x)
                        && __builtin_isless (__builtin_fabs (xh),
                                             __builtin_inf ()), 1))
     {
-      hi = __trunc (xh);
+      hi = trunc (xh);
       if (hi != xh)
        {
          /* The high part is not an integer; the low part does not
index addb60d..b097033 100644 (file)
@@ -171,8 +171,8 @@ __ieee754_gammal_r (long double x, int *signgamp)
        }
       else
        {
-         long double tx = __truncl (x);
-         *signgamp = (tx == 2.0L * __truncl (tx / 2.0L)) ? -1 : 1;
+         long double tx = truncl (x);
+         *signgamp = (tx == 2.0L * truncl (tx / 2.0L)) ? -1 : 1;
          if (x <= -1766.0L)
            /* Underflow.  */
            ret = LDBL_MIN * LDBL_MIN;
index 39a6822..7dc534f 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 
 FLOAT
index b71278a..7f2acbb 100644 (file)
@@ -57,26 +57,6 @@ __ieee754_sqrtf128 (_Float128 __x)
      __z; })
 # endif
 
-# ifndef __trunc
-#  define __trunc(x)                   \
-    ({ double __z;                     \
-     __asm __volatile (                        \
-       "       friz %0,%1\n"           \
-               : "=f" (__z)            \
-               : "f" (x));             \
-     __z; })
-# endif
-# ifndef __truncf
-#  define __truncf(x)                  \
-    ({ float __z;                      \
-     __asm __volatile (                        \
-       "       friz %0,%1\n"           \
-       "       frsp %0,%0\n"           \
-               : "=f" (__z)            \
-               : "f" (x));             \
-     __z; })
-# endif
-
 #endif /* defined _ARCH_PWR5X */
 
 #endif /* _PPC_MATH_PRIVATE_H_ */
index 5712d6a..eef0db6 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_ldbl_opt.h>
 #include <shlib-compat.h>
index d5d72b5..4943b2d 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_ldbl_opt.h>
 #include <shlib-compat.h>
index 989ffc9..5a720d8 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_ldbl_opt.h>
 #include <shlib-compat.h>
index fc5351b..3869c42 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_ldbl_opt.h>
 #include <shlib-compat.h>
index ec28090..ab755b7 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_private.h>
 #include <fenv_private.h>
index ad5c2e2..0c90092 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <math.h>
 #include <math_private.h>
 #include <fenv_private.h>
index 82ad6ff..73b0b55 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <sparc-ifunc.h>
 #include <math.h>
 #include <libm-alias-double.h>
index 1c7a4a0..8098f56 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <sparc-ifunc.h>
 #include <math.h>
 #include <libm-alias-float.h>
index a1b0c60..e606e04 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <libm-alias-double.h>
 
 #define trunc __redirect_trunc
index a7e220b..69ebd01 100644 (file)
@@ -16,6 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#define NO_MATH_REDIRECT
 #include <libm-alias-float.h>
 
 #define truncf __redirect_truncf