aboutsummaryrefslogtreecommitdiff
path: root/libquadmath/math/lrintq.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2018-11-05 23:03:55 +0000
committerJoseph Myers <jsm28@gcc.gnu.org>2018-11-05 23:03:55 +0000
commit4239f144ce50c94f2c6cc232028f167b6ebfd506 (patch)
tree9effaf7dacd8e3e4533a6d6baf3f09e88a990825 /libquadmath/math/lrintq.c
parent0f31a750311079962cb1082bc1202584da491aba (diff)
downloadgcc-4239f144ce50c94f2c6cc232028f167b6ebfd506.zip
gcc-4239f144ce50c94f2c6cc232028f167b6ebfd506.tar.gz
gcc-4239f144ce50c94f2c6cc232028f167b6ebfd506.tar.bz2
Update most of libquadmath/math/ from glibc, automate update (PR libquadmath/68686).
libquadmath sources are mostly based on glibc sources at present, but derived from them by a manual editing / substitution process and with subsequent manual merges. The manual effort involved in merges means they are sometimes incomplete and long-delayed. Since libquadmath was first created, glibc's support for this format has undergone significant changes so that it can also be used in glibc to provide *f128 functions for the _Float128 type from TS 18661-3. This makes it significantly easier to use it for libquadmath in a more automated fashion, since glibc has a float128_private.h header that redefines many identifiers as macros as needed for building *f128 functions. Simply using float128_private.h directly in libquadmath, with unmodified glibc sources except for changing function names in that one header to be *q instead of *f128, would be tricky, given its dependence on lots of other glibc-internal headers (whereas libquadmath supports non-glibc systems), and also given how some libm functions in glibc are built from type-generic templates using a further set of macros rather than from separate function implementations for each type. So instead this patch adds a script update-quadmath.py to convert glibc sources into libquadmath ones, and the script reads float128_private.h to identify many of the substitutions it should make. quadmath-imp.h is updated with various new internal definitions, taken from glibc as needed; this is the main place expected to need updating manually when subsequent merges from glibc are done using the script. No attempt is made to make the script output match the details of existing formatting, although the differences are of a size that makes a rough comparison (ignoring whitespace) possible. Two new public interfaces are added to libquadmath, exp2q and issignalingq, at a new QUADMATH_1.2 symbol version, since those interfaces are used internally by some of the glibc sources being merged into libquadmath; although there is a new symbol version, no change however is made to the libtool version in the libtool-version file. Although there are various other interfaces now in glibc libm but not in libquadmath, this patch does nothing to add such interfaces (although adding many of them would in fact be easy to do, given the script). One internal file (not providing any public interfaces), math/isinf_nsq.c, is removed, as no longer used by anything in libquadmath after the merge. Conditionals in individual source files on <fenv.h> availability or features are moved into quadmath-imp.h (providing trivial macro versions of the functions if real implementations aren't available), to simplify the substitutions in individual source files. Note however that I haven't tested for any configurations lacking <fenv.h>, so further changes could well be needed there. Two files in libquadmath/math/ are based on glibc sources but not updated in this patch: fmaq.c and rem_pio2q.c. Both could be updated after further changes to the script (and quadmath-imp.h as needed); in the case of rem_pio2q.c, based on two separate glibc source files, those separate files would naturally be split out into separate libquadmath source files in the process (as done in this patch with expq_table.h and tanq_kernel.c, where previously two glibc source files had been merged into one libquadmath source file). complex.c, nanq.c and sqrtq.c are not based on glibc sources (though four of the (trivial) functions in complex.c could readily be replaced by instead using the four corresponding files from glibc, if desired). libquadmath also has printf/ and strtod/ sources based on glibc, also mostly not updated for a long time. Again the script could no doubt be made to generate those automatically, although that would be a larger change (effectively some completely separate logic in the script, not sharing much if anything with the existing code). Bootstrapped with no regressions on x86_64-pc-linux-gnu. PR libquadmath/68686 * Makefile.am: (libquadmath_la_SOURCES): Remove math/isinf_nsq.c. Add math/exp2q.c math/issignalingq.c math/lgammaq_neg.c math/lgammaq_product.c math/tanq_kernel.c math/tgammaq_product.c math/casinhq_kernel.c. * Makefile.in: Regenerate. * libquadmath.texi (exp2q, issignalingq): Document. * quadmath-imp.h: Include <errno.h>, <limits.h>, <stdbool.h> and <fenv.h>. (HIGH_ORDER_BIT_IS_SET_FOR_SNAN, FIX_FLT128_LONG_CONVERT_OVERFLOW) (FIX_FLT128_LLONG_CONVERT_OVERFLOW, __quadmath_kernel_tanq) (__quadmath_gamma_productq, __quadmath_gammaq_r) (__quadmath_lgamma_negq, __quadmath_lgamma_productq) (__quadmath_lgammaq_r, __quadmath_kernel_casinhq, mul_splitq) (math_check_force_underflow_complex, __glibc_likely) (__glibc_unlikely, struct rm_ctx, SET_RESTORE_ROUNDF128) (libc_feholdsetround_ctx, libc_feresetround_ctx): New. (feraiseexcept, fenv_t, feholdexcept, fesetround, feupdateenv) (fesetenv, fetestexcept, feclearexcept): Define if not supported through <fenv.h>. (__quadmath_isinf_nsq): Remove. * quadmath.h (exp2q, issignalingq): New. * quadmath.map (QUADMATH_1.2): New. * quadmath_weak.h (exp2q, issignalingq): New. * update-quadmath.py: New file. * math/isinf_nsq.c: Remove file. * math/casinhq_kernel.c, math/exp2q.c, math/expq_table.h, math/issignalingq.c, math/lgammaq_neg.c, math/lgammaq_product.c, math/tanq_kernel.c, math/tgammaq_product.c: New files. Generated from glibc sources with update-quadmath.py. * math/acoshq.c, math/acosq.c, math/asinhq.c, math/asinq.c, math/atan2q.c, math/atanhq.c, math/atanq.c, math/cacoshq.c, math/cacosq.c, math/casinhq.c, math/casinq.c, math/catanhq.c, math/catanq.c, math/cbrtq.c, math/ccoshq.c, math/ceilq.c, math/cexpq.c, math/cimagq.c, math/clog10q.c, math/clogq.c, math/conjq.c, math/copysignq.c, math/coshq.c, math/cosq.c, math/cosq_kernel.c, math/cprojq.c, math/crealq.c, math/csinhq.c, math/csinq.c, math/csqrtq.c, math/ctanhq.c, math/ctanq.c, math/erfq.c, math/expm1q.c, math/expq.c, math/fabsq.c, math/fdimq.c, math/finiteq.c, math/floorq.c, math/fmaxq.c, math/fminq.c, math/fmodq.c, math/frexpq.c, math/hypotq.c, math/ilogbq.c, math/isinfq.c, math/isnanq.c, math/j0q.c, math/j1q.c, math/jnq.c, math/ldexpq.c, math/lgammaq.c, math/llrintq.c, math/llroundq.c, math/log10q.c, math/log1pq.c, math/log2q.c, math/logbq.c, math/logq.c, math/lrintq.c, math/lroundq.c, math/modfq.c, math/nearbyintq.c, math/nextafterq.c, math/powq.c, math/remainderq.c, math/remquoq.c, math/rintq.c, math/roundq.c, math/scalblnq.c, math/scalbnq.c, math/signbitq.c, math/sincos_table.c, math/sincosq.c, math/sincosq_kernel.c, math/sinhq.c, math/sinq.c, math/sinq_kernel.c, math/tanhq.c, math/tanq.c, math/tgammaq.c, math/truncq.c, math/x2y2m1q.c: Regenerate from glibc sources with update-quadmath.py. From-SVN: r265822
Diffstat (limited to 'libquadmath/math/lrintq.c')
-rw-r--r--libquadmath/math/lrintq.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/libquadmath/math/lrintq.c b/libquadmath/math/lrintq.c
index 50a3005..e32b28c 100644
--- a/libquadmath/math/lrintq.c
+++ b/libquadmath/math/lrintq.c
@@ -1,6 +1,6 @@
/* Round argument to nearest integral value according to current rounding
direction.
- Copyright (C) 1997-2017 Free Software Foundation, Inc.
+ Copyright (C) 1997-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997 and
Jakub Jelinek <jj@ultra.linux.cz>, 1999.
@@ -16,9 +16,8 @@
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, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
#include "quadmath-imp.h"
@@ -56,9 +55,7 @@ lrintq (__float128 x)
/* In the event of overflow we must raise the "invalid"
exception, but not "inexact". */
t = nearbyintq (x);
-#ifdef USE_FENV_H
feraiseexcept (t == LONG_MAX ? FE_INEXACT : FE_INVALID);
-#endif
}
else
#endif
@@ -85,9 +82,7 @@ lrintq (__float128 x)
/* In the event of overflow we must raise the "invalid"
exception, but not "inexact". */
t = nearbyintq (x);
-#ifdef USE_FENV_H
feraiseexcept (t == LONG_MAX ? FE_INEXACT : FE_INVALID);
-#endif
}
else
#endif
@@ -113,16 +108,20 @@ lrintq (__float128 x)
unspecified. */
#if defined FE_INVALID || defined FE_INEXACT
if (x < (__float128) LONG_MIN
- && x > (__float128) LONG_MIN - 1.0Q)
+ && x > (__float128) LONG_MIN - 1)
{
/* If truncation produces LONG_MIN, the cast will not raise
the exception, but may raise "inexact". */
t = nearbyintq (x);
-#ifdef USE_FENV_H
feraiseexcept (t == LONG_MIN ? FE_INEXACT : FE_INVALID);
-#endif
return LONG_MIN;
}
+ else if (FIX_FLT128_LONG_CONVERT_OVERFLOW && x != (__float128) LONG_MIN)
+ {
+ feraiseexcept (FE_INVALID);
+ return sx == 0 ? LONG_MAX : LONG_MIN;
+ }
+
#endif
return (long int) x;
}