diff --git a/ChangeLog b/ChangeLog index 75ccb4b16b..d2282058ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,37 @@ +2017-05-14 Paul E. Murphy + Gabriel F. T. Gomes + + * include/complex.h (__kernel_casinhf128): New declaration. + * include/float.h: New file. + * include/math.h (__finitef128): Add a hidden def. + (__isinff128): Likewise. + (__isnanf128): Likewise. + (__fpclassify): Likewise. + (__issignalling): Likewise. + (__expf128): Likewise. + (__expm1f128): Likewise. + + * sysdeps/generic/fix-fp-int-convert-overflow.h: + (FIX_FLT128_LONG_CONVERT_OVERFLOW): New macro. + (FIX_FLT128_LLONG_CONVERT_OVERFLOW): Likewise. + + * sysdeps/generic/math-type-macros-float128.h: New file. + + * sysdeps/generic/math_private.h: Include bits/floatn.h and + math_private_calls.h for _Float128. + (__isinff128): New inline implementation used when GCC < 7.0, + since in this case __builtin_isinf_sign is broken. + (fabsf128): New inline implementation that calls the builtin. + (__EXPR_FLT128): New macro. + (min_of_type): Optionally include _Float128 types too. + + * sysdeps/generic/math_private_calls.h (__kernel_sincos): + Declare for _Float128. + (__kernel_rem_pio2): Likewise. + + * sysdeps/ieee754/ldbl-opt/s_sin.c: + (__DECL_SIMD_sincos_disablef128): New macro. + 2017-05-14 Gabriel F. T. Gomes * math/math.h: Include bits/math-finite.h for float128. diff --git a/include/complex.h b/include/complex.h index 082e71fb10..2c86709ced 100644 --- a/include/complex.h +++ b/include/complex.h @@ -8,6 +8,9 @@ extern complex float __kernel_casinhf (complex float z, int adj); extern complex double __kernel_casinh (complex double z, int adj); extern complex long double __kernel_casinhl (complex long double z, int adj); +# if __HAVE_DISTINCT_FLOAT128 +extern __CFLOAT128 __kernel_casinhf128 (__CFLOAT128 z, int adj); +# endif # endif #endif diff --git a/include/float.h b/include/float.h new file mode 100644 index 0000000000..20c4acbf78 --- /dev/null +++ b/include/float.h @@ -0,0 +1,31 @@ +#ifndef _LIBC_FLOAT_H +#define _LIBC_FLOAT_H + +#ifndef _ISOMAC +# define __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif + +#include_next + +/* Supplement float.h macros for _Float128 for older compilers + which do not yet support the type. These are described in + TS 18661-3. */ +#ifndef _ISOMAC +# include +# include +# if !__GNUC_PREREQ (7, 0) && __HAVE_DISTINCT_FLOAT128 +# define FLT128_MANT_DIG 113 +# define FLT128_DECIMAL_DIG 36 +# define FLT128_DIG 33 +# define FLT128_MIN_EXP (-16381) +# define FLT128_MIN_10_EXP (-4931) +# define FLT128_MAX_EXP 16384 +# define FLT128_MAX_10_EXP 4932 +# define FLT128_MAX 1.18973149535723176508575932662800702e+4932Q +# define FLT128_EPSILON 1.92592994438723585305597794258492732e-34Q +# define FLT128_MIN 3.36210314311209350626267781732175260e-4932Q +# define FLT128_TRUE_MIN 6.47517511943802511092443895822764655e-4966Q +# endif +#endif + +#endif /* _LIBC_FLOAT_H */ diff --git a/include/math.h b/include/math.h index 6ff67830f8..a069680233 100644 --- a/include/math.h +++ b/include/math.h @@ -26,6 +26,12 @@ hidden_proto (__finitel) hidden_proto (__isinfl) hidden_proto (__isnanl) # endif + +# if __HAVE_DISTINCT_FLOAT128 +hidden_proto (__finitef128) +hidden_proto (__isinff128) +hidden_proto (__isnanf128) +# endif # endif libm_hidden_proto (__fpclassify) @@ -43,5 +49,12 @@ libm_hidden_proto (__expl) libm_hidden_proto (__expm1l) # endif +# if __HAVE_DISTINCT_FLOAT128 +libm_hidden_proto (__fpclassifyf128) +libm_hidden_proto (__issignalingf128) +libm_hidden_proto (__expf128) +libm_hidden_proto (__expm1f128) +# endif + #endif #endif diff --git a/sysdeps/generic/fix-fp-int-convert-overflow.h b/sysdeps/generic/fix-fp-int-convert-overflow.h index f53eaf00b2..4b0cd9159f 100644 --- a/sysdeps/generic/fix-fp-int-convert-overflow.h +++ b/sysdeps/generic/fix-fp-int-convert-overflow.h @@ -29,5 +29,7 @@ #define FIX_DBL_LLONG_CONVERT_OVERFLOW 0 #define FIX_LDBL_LONG_CONVERT_OVERFLOW 0 #define FIX_LDBL_LLONG_CONVERT_OVERFLOW 0 +#define FIX_FLT128_LONG_CONVERT_OVERFLOW 0 +#define FIX_FLT128_LLONG_CONVERT_OVERFLOW 0 #endif /* fix-fp-int-convert-overflow.h */ diff --git a/sysdeps/generic/math-type-macros-float128.h b/sysdeps/generic/math-type-macros-float128.h new file mode 100644 index 0000000000..dcb8560548 --- /dev/null +++ b/sysdeps/generic/math-type-macros-float128.h @@ -0,0 +1,39 @@ +/* Helper macros for _Float128 variants of type generic functions of libm. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _MATH_TYPE_MACROS_FLOAT128 +#define _MATH_TYPE_MACROS_FLOAT128 + +#include +#include + +#define M_LIT(c) __f128 (c) +#define M_PFX FLT128 +#define M_SUF(c) c ## f128 +#define FLOAT _Float128 +#define M_STRTO_NAN __strtof128_nan + +#define CFLOAT __CFLOAT128 + +#define M_MLIT(c) c ## f128 + + +/* Supply the generic macros. */ +#include + +#endif diff --git a/sysdeps/generic/math_private.h b/sysdeps/generic/math_private.h index 4d8a35ff87..6ea5e25e5a 100644 --- a/sysdeps/generic/math_private.h +++ b/sysdeps/generic/math_private.h @@ -23,6 +23,9 @@ #include #include +/* Gather machine dependent _Floatn support. */ +#include + /* The original fdlibm code used statements like: n0 = ((*(int*)&one)>>29)^1; * index of high word * ix0 = *(n0+(int*)&x); * high word of x * @@ -211,6 +214,41 @@ do { \ #undef _MSUF_ #undef _Mdouble_ +#if __HAVE_DISTINCT_FLOAT128 +# define _Mdouble_ _Float128 +# define _MSUF_ f128 +# define __MATH_DECLARING_FLOATN +# include +# undef __MATH_DECLARING_FLOATN +# undef _MSUF_ +# undef _Mdouble_ +#endif + +#if __HAVE_DISTINCT_FLOAT128 + +/* __builtin_isinf_sign is broken in GCC < 7 for float128. */ +# if ! __GNUC_PREREQ (7, 0) +# include +extern inline int +__isinff128 (_Float128 x) +{ + int64_t hx, lx; + GET_FLOAT128_WORDS64 (hx, lx, x); + lx |= (hx & 0x7fffffffffffffffLL) ^ 0x7fff000000000000LL; + lx |= -lx; + return ~(lx >> 63) & (hx >> 62); +} +# endif + +extern inline _Float128 +fabsf128 (_Float128 x) +{ + return __builtin_fabsf128 (x); +} +#endif + + + /* fdlibm kernel function */ extern double __kernel_standard (double,double,int); extern float __kernel_standard_f (float,float,int); @@ -263,13 +301,24 @@ extern void __docos (double __x, double __dx, double __v[]); }) #endif +#if __HAVE_DISTINCT_FLOAT128 +# define __EXPR_FLT128(x, yes, no) \ + __builtin_choose_expr (__builtin_types_compatible_p \ + (__typeof (x), long double), no, yes) +#else +# define __EXPR_FLT128(x, yes, no) no +#endif + + #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, \ __builtin_choose_expr \ (__builtin_types_compatible_p (type, double), \ - DBL_MIN, LDBL_MIN)) + DBL_MIN, \ + __EXPR_FLT128 (x, FLT128_MIN, LDBL_MIN))) /* If X (which is not a NaN) is subnormal, force an underflow exception. */ diff --git a/sysdeps/generic/math_private_calls.h b/sysdeps/generic/math_private_calls.h index 8c1d304a8f..34bbd5e684 100644 --- a/sysdeps/generic/math_private_calls.h +++ b/sysdeps/generic/math_private_calls.h @@ -64,12 +64,12 @@ extern _Mdouble_ __MSUF (__kernel_sin) (_Mdouble_, _Mdouble_, int); extern _Mdouble_ __MSUF (__kernel_cos) (_Mdouble_, _Mdouble_); extern _Mdouble_ __MSUF (__kernel_tan) (_Mdouble_, _Mdouble_, int); -#if defined __MATH_DECLARING_LONG_DOUBLE +#if defined __MATH_DECLARING_LONG_DOUBLE || defined __MATH_DECLARING_FLOATN extern void __MSUF (__kernel_sincos) (_Mdouble_, _Mdouble_, _Mdouble_ *, _Mdouble_ *, int); #endif -#if !defined __MATH_DECLARING_LONG_DOUBLE +#if !defined __MATH_DECLARING_LONG_DOUBLE || defined __MATH_DECLARING_FLOATN extern int __MSUF (__kernel_rem_pio2) (_Mdouble_ *, _Mdouble_ *, int, int, int, const int32_t *); #endif diff --git a/sysdeps/ieee754/ldbl-opt/s_sin.c b/sysdeps/ieee754/ldbl-opt/s_sin.c index 04e60e2731..6932ccc080 100644 --- a/sysdeps/ieee754/ldbl-opt/s_sin.c +++ b/sysdeps/ieee754/ldbl-opt/s_sin.c @@ -4,6 +4,7 @@ #define __DECL_SIMD_sincos_disable #define __DECL_SIMD_sincos_disablef #define __DECL_SIMD_sincos_disablel +#define __DECL_SIMD_sincos_disablef128 #include #undef NAN #undef sincos