From 81dca813cc35f91414731fdd0ff6b756d5e1827f Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 27 Sep 2018 20:04:48 +0000 Subject: Use copysign functions not __copysign functions in glibc libm. 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 __copysign functions to call the corresponding copysign names instead, with asm redirection to __copysign when the calls are not inlined (all cases are inlined except for IBM long double for powerpc soft-float / e500v1). This eliminates the need for an inline function defining __copysign in terms of __builtin_copysign. Tested for x86_64, and with build-many-glibcs.py. * include/math.h [!_ISOMAC && !(__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) && !NO_MATH_REDIRECT] (MATH_REDIRECT_BINARY_ARGS): New macro. [!_ISOMAC && !(__FINITE_MATH_ONLY__ && __FINITE_MATH_ONLY__ > 0) && !NO_MATH_REDIRECT] (copysign): Redirect using MATH_REDIRECT. * sysdeps/alpha/fpu/s_copysign.c: Define NO_MATH_REDIRECT before header inclusion. * sysdeps/alpha/fpu/s_copysignf.c: Likewise. * sysdeps/ieee754/dbl-64/s_copysign.c: Likewise. * sysdeps/ieee754/float128/s_copysignf128.c: Likewise. * sysdeps/ieee754/flt-32/s_copysignf.c: Likewise. * sysdeps/ieee754/ldbl-128/s_copysignl.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_copysignl.c: Likewise. * sysdeps/ieee754/ldbl-96/s_copysignl.c: Likewise. * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysign.c: Likewise. * sysdeps/powerpc/powerpc32/power4/fpu/multiarch/s_copysignf.c: Likewise. * sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c: Likewise. * sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysignf.c: Likewise. * sysdeps/riscv/rvd/s_copysign.c: Likewise. * sysdeps/riscv/rvf/s_copysignf.c: Likewise. * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign.c: Likewise. * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.c: Likewise. * sysdeps/generic/math_private_calls.h [!__MATH_DECLARING_LONG_DOUBLE || !NO_LONG_DOUBLE] (__copysign): Do not declare and define as an inline function. * math/divtc3.c (__divtc3): Use copysign functions instead of __copysign variants. * math/multc3.c (__multc3): Likewise. * sysdeps/generic/math-type-macros.h (M_COPYSIGN): Likewise. * sysdeps/ieee754/dbl-64/e_atan2.c (signArctan2): Likewise. * sysdeps/ieee754/dbl-64/e_atanh.c (__ieee754_atanh): Likewise. * sysdeps/ieee754/dbl-64/e_gamma_r.c (__ieee754_gamma_r): Likewise. * sysdeps/ieee754/dbl-64/e_jn.c (__ieee754_jn): Likewise. (__ieee754_yn): Likewise. * sysdeps/ieee754/dbl-64/s_asinh.c (__asinh): Likewise. * sysdeps/ieee754/dbl-64/s_atan.c (__signArctan): Likewise. * sysdeps/ieee754/dbl-64/s_scalbln.c (__scalbln): Likewise. * sysdeps/ieee754/dbl-64/s_scalbn.c (__scalbn): Likewise. * sysdeps/ieee754/dbl-64/s_sin.c (do_sin): Likewise. (__sin): Likewise. * sysdeps/ieee754/dbl-64/s_sincos.c (__sincos): Likewise. * sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c (__nearbyint): Likewise. * sysdeps/ieee754/dbl-64/wordsize-64/s_scalbln.c (__scalbln): Likewise. * sysdeps/ieee754/dbl-64/wordsize-64/s_scalbn.c (__scalbn): Likewise. * sysdeps/ieee754/flt-32/e_atanhf.c (__ieee754_atanhf): Likewise. * sysdeps/ieee754/flt-32/e_gammaf_r.c (__ieee754_gammaf_r): Likewise. * sysdeps/ieee754/flt-32/e_jnf.c (__ieee754_jnf): Likewise. (__ieee754_ynf): Likewise. * sysdeps/ieee754/flt-32/s_asinhf.c (__asinhf): Likewise. * sysdeps/ieee754/flt-32/s_scalbnf.c (__scalbnf): Likewise. * sysdeps/ieee754/k_standard.c (__kernel_standard): Likewise. * sysdeps/ieee754/ldbl-128/e_gammal_r.c (__ieee754_gammal_r): Likewise. * sysdeps/ieee754/ldbl-128/e_jnl.c (__ieee754_jnl): Likewise. (__ieee754_ynl): Likewise. * sysdeps/ieee754/ldbl-128/s_scalblnl.c (__scalblnl): Likewise. * sysdeps/ieee754/ldbl-128/s_scalbnl.c (__scalbnl): Likewise. * sysdeps/ieee754/ldbl-128ibm/e_gammal_r.c (__ieee754_gammal_r): Likewise. * sysdeps/ieee754/ldbl-128ibm/e_jnl.c (__ieee754_jnl): Likewise. (__ieee754_ynl): Likewise. * sysdeps/ieee754/ldbl-128ibm/s_fmal.c (__fmal): Likewise. * sysdeps/ieee754/ldbl-128ibm/s_scalblnl.c (__scalblnl): Likewise. * sysdeps/ieee754/ldbl-128ibm/s_scalbnl.c (__scalbnl): Likewise. * sysdeps/ieee754/ldbl-96/e_gammal_r.c (__ieee754_gammal_r): Likewise. * sysdeps/ieee754/ldbl-96/e_jnl.c (__ieee754_jnl): Likewise. (__ieee754_ynl) * sysdeps/ieee754/ldbl-96/s_asinhl.c (__asinhl): Likewise. * sysdeps/ieee754/ldbl-96/s_scalblnl.c (__scalblnl): Likewise. * sysdeps/ieee754/ldbl-opt/nldbl-copysign.c (copysignl): Likewise. * sysdeps/powerpc/power5+/fpu/s_modf.c (__modf): Likewise. * sysdeps/powerpc/power5+/fpu/s_modff.c (__modff): Likewise. --- sysdeps/ieee754/dbl-64/e_atan2.c | 2 +- sysdeps/ieee754/dbl-64/e_atanh.c | 2 +- sysdeps/ieee754/dbl-64/e_gamma_r.c | 8 ++++---- sysdeps/ieee754/dbl-64/e_jn.c | 4 ++-- sysdeps/ieee754/dbl-64/s_asinh.c | 2 +- sysdeps/ieee754/dbl-64/s_atan.c | 2 +- sysdeps/ieee754/dbl-64/s_copysign.c | 1 + sysdeps/ieee754/dbl-64/s_scalbln.c | 6 +++--- sysdeps/ieee754/dbl-64/s_scalbn.c | 6 +++--- sysdeps/ieee754/dbl-64/s_sin.c | 4 ++-- sysdeps/ieee754/dbl-64/s_sincos.c | 2 +- sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c | 2 +- sysdeps/ieee754/dbl-64/wordsize-64/s_scalbln.c | 6 +++--- sysdeps/ieee754/dbl-64/wordsize-64/s_scalbn.c | 6 +++--- 14 files changed, 27 insertions(+), 26 deletions(-) (limited to 'sysdeps/ieee754/dbl-64') diff --git a/sysdeps/ieee754/dbl-64/e_atan2.c b/sysdeps/ieee754/dbl-64/e_atan2.c index c3e1b2218c..741ba9b42c 100644 --- a/sysdeps/ieee754/dbl-64/e_atan2.c +++ b/sysdeps/ieee754/dbl-64/e_atan2.c @@ -64,7 +64,7 @@ static double atan2Mp (double, double, const int[]); static double signArctan2 (double y, double z) { - return __copysign (z, y); + return copysign (z, y); } static double normalized (double, double, double, double); diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c index da4da8270c..d145b2b923 100644 --- a/sysdeps/ieee754/dbl-64/e_atanh.c +++ b/sysdeps/ieee754/dbl-64/e_atanh.c @@ -71,6 +71,6 @@ __ieee754_atanh (double x) return x / 0.0; } - return __copysign (t, x); + return copysign (t, x); } strong_alias (__ieee754_atanh, __atanh_finite) diff --git a/sysdeps/ieee754/dbl-64/e_gamma_r.c b/sysdeps/ieee754/dbl-64/e_gamma_r.c index 7707c062cb..9692b733e1 100644 --- a/sysdeps/ieee754/dbl-64/e_gamma_r.c +++ b/sysdeps/ieee754/dbl-64/e_gamma_r.c @@ -199,22 +199,22 @@ __ieee754_gamma_r (double x, int *signgamp) { if (*signgamp < 0) { - ret = math_narrow_eval (-__copysign (DBL_MAX, ret) * DBL_MAX); + ret = math_narrow_eval (-copysign (DBL_MAX, ret) * DBL_MAX); ret = -ret; } else - ret = math_narrow_eval (__copysign (DBL_MAX, ret) * DBL_MAX); + ret = math_narrow_eval (copysign (DBL_MAX, ret) * DBL_MAX); return ret; } else if (ret == 0) { if (*signgamp < 0) { - ret = math_narrow_eval (-__copysign (DBL_MIN, ret) * DBL_MIN); + ret = math_narrow_eval (-copysign (DBL_MIN, ret) * DBL_MIN); ret = -ret; } else - ret = math_narrow_eval (__copysign (DBL_MIN, ret) * DBL_MIN); + ret = math_narrow_eval (copysign (DBL_MIN, ret) * DBL_MIN); return ret; } else diff --git a/sysdeps/ieee754/dbl-64/e_jn.c b/sysdeps/ieee754/dbl-64/e_jn.c index cb7c6cf266..aff06ead16 100644 --- a/sysdeps/ieee754/dbl-64/e_jn.c +++ b/sysdeps/ieee754/dbl-64/e_jn.c @@ -250,7 +250,7 @@ __ieee754_jn (int n, double x) } if (ret == 0) { - ret = math_narrow_eval (__copysign (DBL_MIN, ret) * DBL_MIN); + ret = math_narrow_eval (copysign (DBL_MIN, ret) * DBL_MIN); __set_errno (ERANGE); } else @@ -344,7 +344,7 @@ __ieee754_yn (int n, double x) } out: if (isinf (ret)) - ret = __copysign (DBL_MAX, ret) * DBL_MAX; + ret = copysign (DBL_MAX, ret) * DBL_MAX; return ret; } strong_alias (__ieee754_yn, __yn_finite) diff --git a/sysdeps/ieee754/dbl-64/s_asinh.c b/sysdeps/ieee754/dbl-64/s_asinh.c index 192ff8594d..7fd281d791 100644 --- a/sysdeps/ieee754/dbl-64/s_asinh.c +++ b/sysdeps/ieee754/dbl-64/s_asinh.c @@ -65,6 +65,6 @@ __asinh (double x) w = __log1p (xa + t / (one + sqrt (one + t))); } } - return __copysign (w, x); + return copysign (w, x); } libm_alias_double (__asinh, asinh) diff --git a/sysdeps/ieee754/dbl-64/s_atan.c b/sysdeps/ieee754/dbl-64/s_atan.c index 311c28fe13..e346581fb6 100644 --- a/sysdeps/ieee754/dbl-64/s_atan.c +++ b/sysdeps/ieee754/dbl-64/s_atan.c @@ -57,7 +57,7 @@ static double atanMp (double, const int[]); static double __signArctan (double x, double y) { - return __copysign (y, x); + return copysign (y, x); } diff --git a/sysdeps/ieee754/dbl-64/s_copysign.c b/sysdeps/ieee754/dbl-64/s_copysign.c index ab81d732ab..589b088c95 100644 --- a/sysdeps/ieee754/dbl-64/s_copysign.c +++ b/sysdeps/ieee754/dbl-64/s_copysign.c @@ -20,6 +20,7 @@ static char rcsid[] = "$NetBSD: s_copysign.c,v 1.8 1995/05/10 20:46:57 jtc Exp $ * with the sign bit of y. */ +#define NO_MATH_REDIRECT #include #include #include diff --git a/sysdeps/ieee754/dbl-64/s_scalbln.c b/sysdeps/ieee754/dbl-64/s_scalbln.c index 32cd12e3b0..0e3d732e48 100644 --- a/sysdeps/ieee754/dbl-64/s_scalbln.c +++ b/sysdeps/ieee754/dbl-64/s_scalbln.c @@ -42,9 +42,9 @@ __scalbln (double x, long int n) if (__glibc_unlikely (k == 0x7ff)) return x + x; /* NaN or Inf */ if (__glibc_unlikely (n < -50000)) - return tiny * __copysign (tiny, x); /*underflow*/ + return tiny * copysign (tiny, x); /*underflow*/ if (__glibc_unlikely (n > 50000 || k + n > 0x7fe)) - return huge * __copysign (huge, x); /* overflow */ + return huge * copysign (huge, x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k + n; @@ -53,7 +53,7 @@ __scalbln (double x, long int n) SET_HIGH_WORD (x, (hx & 0x800fffff) | (k << 20)); return x; } if (k <= -54) - return tiny * __copysign (tiny, x); /*underflow*/ + return tiny * copysign (tiny, x); /*underflow*/ k += 54; /* subnormal result */ SET_HIGH_WORD (x, (hx & 0x800fffff) | (k << 20)); return x * twom54; diff --git a/sysdeps/ieee754/dbl-64/s_scalbn.c b/sysdeps/ieee754/dbl-64/s_scalbn.c index 58c7e1b33a..cf4d6846ee 100644 --- a/sysdeps/ieee754/dbl-64/s_scalbn.c +++ b/sysdeps/ieee754/dbl-64/s_scalbn.c @@ -42,9 +42,9 @@ __scalbn (double x, int n) if (__glibc_unlikely (k == 0x7ff)) return x + x; /* NaN or Inf */ if (__glibc_unlikely (n < -50000)) - return tiny * __copysign (tiny, x); /*underflow*/ + return tiny * copysign (tiny, x); /*underflow*/ if (__glibc_unlikely (n > 50000 || k + n > 0x7fe)) - return huge * __copysign (huge, x); /* overflow */ + return huge * copysign (huge, x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k + n; @@ -53,7 +53,7 @@ __scalbn (double x, int n) SET_HIGH_WORD (x, (hx & 0x800fffff) | (k << 20)); return x; } if (k <= -54) - return tiny * __copysign (tiny, x); /*underflow*/ + return tiny * copysign (tiny, x); /*underflow*/ k += 54; /* subnormal result */ SET_HIGH_WORD (x, (hx & 0x800fffff) | (k << 20)); return x * twom54; diff --git a/sysdeps/ieee754/dbl-64/s_sin.c b/sysdeps/ieee754/dbl-64/s_sin.c index db1687edd5..212f83c904 100644 --- a/sysdeps/ieee754/dbl-64/s_sin.c +++ b/sysdeps/ieee754/dbl-64/s_sin.c @@ -144,7 +144,7 @@ do_sin (double x, double dx) c = x * dx + xx * (cs2 + xx * (cs4 + xx * cs6)); SINCOS_TABLE_LOOKUP (u, sn, ssn, cs, ccs); cor = (ssn + s * ccs - sn * c) + cs * s; - return __copysign (sn + cor, xold); + return copysign (sn + cor, xold); } /* Reduce range of x to within PI/2 with abs (x) < 105414350. The high part @@ -231,7 +231,7 @@ __sin (double x) { t = hp0 - fabs (x); /* Max ULP is 0.51. */ - retval = __copysign (do_cos (t, hp1), x); + retval = copysign (do_cos (t, hp1), x); } /* else if (k < 0x400368fd) */ /*-------------------------- 2.426265<|x|< 105414350 ----------------------*/ diff --git a/sysdeps/ieee754/dbl-64/s_sincos.c b/sysdeps/ieee754/dbl-64/s_sincos.c index 6dc1609fa4..41664c1bd4 100644 --- a/sysdeps/ieee754/dbl-64/s_sincos.c +++ b/sysdeps/ieee754/dbl-64/s_sincos.c @@ -63,7 +63,7 @@ __sincos (double x, double *sinx, double *cosx) y = hp0 - fabs (x); a = y + hp1; da = (y - a) + hp1; - *sinx = __copysign (do_cos (a, da), x); + *sinx = copysign (do_cos (a, da), x); *cosx = do_sin (a, da); return; } diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c index 2bb59de30b..92fa72af59 100644 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c +++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c @@ -49,7 +49,7 @@ __nearbyint(double x) double t = w-TWO52[sx]; math_force_eval (t); libc_fesetenv (&env); - return __copysign (t, x); + return copysign (t, x); } } else { if(j0==0x400) return x+x; /* inf or NaN */ diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbln.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbln.c index 8dce51e928..071c9d7794 100644 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbln.c +++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbln.c @@ -40,9 +40,9 @@ __scalbln (double x, long int n) } if (__builtin_expect(k==0x7ff, 0)) return x+x; /* NaN or Inf */ if (__builtin_expect(n< -50000, 0)) - return tiny*__copysign(tiny,x); /*underflow*/ + return tiny*copysign(tiny,x); /*underflow*/ if (__builtin_expect(n> 50000 || k+n > 0x7fe, 0)) - return huge*__copysign(huge,x); /* overflow */ + return huge*copysign(huge,x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k+n; @@ -50,7 +50,7 @@ __scalbln (double x, long int n) {INSERT_WORDS64(x,(ix&UINT64_C(0x800fffffffffffff))|(k<<52)); return x;} if (k <= -54) - return tiny*__copysign(tiny,x); /*underflow*/ + return tiny*copysign(tiny,x); /*underflow*/ k += 54; /* subnormal result */ INSERT_WORDS64(x,(ix&INT64_C(0x800fffffffffffff))|(k<<52)); return x*twom54; diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbn.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbn.c index d517a919c8..4491227f3e 100644 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbn.c +++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_scalbn.c @@ -40,9 +40,9 @@ __scalbn (double x, int n) } if (__builtin_expect(k==0x7ff, 0)) return x+x; /* NaN or Inf */ if (__builtin_expect(n< -50000, 0)) - return tiny*__copysign(tiny,x); /*underflow*/ + return tiny*copysign(tiny,x); /*underflow*/ if (__builtin_expect(n> 50000 || k+n > 0x7fe, 0)) - return huge*__copysign(huge,x); /* overflow */ + return huge*copysign(huge,x); /* overflow */ /* Now k and n are bounded we know that k = k+n does not overflow. */ k = k+n; @@ -50,7 +50,7 @@ __scalbn (double x, int n) {INSERT_WORDS64(x,(ix&UINT64_C(0x800fffffffffffff))|(k<<52)); return x;} if (k <= -54) - return tiny*__copysign(tiny,x); /*underflow*/ + return tiny*copysign(tiny,x); /*underflow*/ k += 54; /* subnormal result */ INSERT_WORDS64(x,(ix&INT64_C(0x800fffffffffffff))|(k<<52)); return x*twom54; -- cgit 1.4.1