From b4e75104b432e86dc8e308e8f58391bee6b33d78 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 10 Nov 2016 21:41:56 +0000 Subject: Refactor some libm type-generic macros. This patch refactors some type-generic libm macros, in both math.h and math_private.h, to be based on a common __MATH_TG macro rather than all replicating similar logic to choose a function to call based on the type of the argument. This should serve to illustrate what I think float128 support for such macros should look like: common macros such as __MATH_TG may need different definitions depending on whether float128 is supported in glibc, so that the individual macros themselves do not need conditionals on float128 support. Tested for x86_64, x86, mips64 and powerpc. * math/math.h (__MATH_TG): New macro. [__USE_ISOC99] (fpclassify): Define using __MATH_TG. [__USE_ISOC99] (signbit): Likewise. [__USE_ISOC99] (isfinite): Likewise. [__USE_ISOC99] (isnan): Likewise. [__USE_ISOC99] (isinf): Likewise. [__GLIBC_USE (IEC_60559_BFP_EXT)] (issignaling): Likewise. [__GLIBC_USE (IEC_60559_BFP_EXT)] (__MATH_EVAL_FMT2): New macro. [__GLIBC_USE (IEC_60559_BFP_EXT)] (iseqsig): Define using __MATH_TG and __MATH_EVAL_FMT2. * sysdeps/generic/math_private.h (fabs_tg): Define using __MATH_TG. * sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h [!__NO_LONG_DOUBLE_MATH] (__iscanonicalf): New macro. [!__NO_LONG_DOUBLE_MATH] (__iscanonical): Likewise. [!__NO_LONG_DOUBLE_MATH] (iscanonical): Define using __MATH_TG. * sysdeps/ieee754/ldbl-96/bits/iscanonical.h (__iscanonicalf): New macro. (__iscanonical): Likewise. (iscanonical): Define using __MATH_TG. --- sysdeps/generic/math_private.h | 7 +------ sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h | 7 +++---- sysdeps/ieee754/ldbl-96/bits/iscanonical.h | 7 +++---- 3 files changed, 7 insertions(+), 14 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/generic/math_private.h b/sysdeps/generic/math_private.h index 28e5df0..c0d4e3d 100644 --- a/sysdeps/generic/math_private.h +++ b/sysdeps/generic/math_private.h @@ -427,12 +427,7 @@ extern long double __lgamma_productl (long double t, long double x, }) #endif -#define fabs_tg(x) __builtin_choose_expr \ - (__builtin_types_compatible_p (__typeof (x), float), \ - __builtin_fabsf (x), \ - __builtin_choose_expr \ - (__builtin_types_compatible_p (__typeof (x), double), \ - __builtin_fabs (x), __builtin_fabsl (x))) +#define fabs_tg(x) __MATH_TG ((x), (__typeof (x)) __builtin_fabs, (x)) #define min_of_type(type) __builtin_choose_expr \ (__builtin_types_compatible_p (type, float), \ FLT_MIN, \ diff --git a/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h b/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h index c7b7c63..d613cde 100644 --- a/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h +++ b/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h @@ -25,6 +25,8 @@ #else extern int __iscanonicall (long double __x) __THROW __attribute__ ((__const__)); +# define __iscanonicalf(x) ((void) (__typeof (x)) (x), 1) +# define __iscanonical(x) ((void) (__typeof (x)) (x), 1) /* Return nonzero value if X is canonical. In IEEE interchange binary formats, all values are canonical, but the argument must still be @@ -32,8 +34,5 @@ extern int __iscanonicall (long double __x) conversion, before being discarded; in IBM long double, there are encodings that are not consistently handled as corresponding to any particular value of the type, and we return 0 for those. */ -# define iscanonical(x) \ - (sizeof (x) == sizeof (long double) \ - ? __iscanonicall (x) \ - : ((void) (__typeof (x)) (x), 1)) +# define iscanonical(x) __MATH_TG ((x), __iscanonical, (x)) #endif diff --git a/sysdeps/ieee754/ldbl-96/bits/iscanonical.h b/sysdeps/ieee754/ldbl-96/bits/iscanonical.h index af0c72c..8638db8 100644 --- a/sysdeps/ieee754/ldbl-96/bits/iscanonical.h +++ b/sysdeps/ieee754/ldbl-96/bits/iscanonical.h @@ -22,6 +22,8 @@ extern int __iscanonicall (long double __x) __THROW __attribute__ ((__const__)); +#define __iscanonicalf(x) ((void) (__typeof (x)) (x), 1) +#define __iscanonical(x) ((void) (__typeof (x)) (x), 1) /* Return nonzero value if X is canonical. In IEEE interchange binary formats, all values are canonical, but the argument must still be @@ -29,7 +31,4 @@ extern int __iscanonicall (long double __x) conversion, before being discarded; in extended precision, there are encodings that are not consistently handled as corresponding to any particular value of the type, and we return 0 for those. */ -#define iscanonical(x) \ - (sizeof (x) == sizeof (long double) \ - ? __iscanonicall (x) \ - : ((void) (__typeof (x)) (x), 1)) +#define iscanonical(x) __MATH_TG ((x), __iscanonical, (x)) -- cgit v1.1