1e2bffd05c
Continuing the move of libm aliases to common macros that can create _FloatN / _FloatNx aliases in future, this patch converts some dbl-64 functions to using libm_alias_double, thereby eliminating the need for some ldbl-opt wrappers. This patch deliberately limits what functions are converted so that it can be verified by comparison of stipped binaries. Specifically, atan and tan are excluded because they first need converting to being weak aliases; fma is omitted as it has additional complications with versions in other directories (removing the ldbl-opt version can e.g. cause the ldbl-128 version to be used instead of dbl-64); and functions that have both dbl-64/wordsize-64 and ldbl-opt versions are excluded because ldbl-opt currently always wraps dbl-64 function versions, so changing those will result in platforms using both ldbl-opt and dbl-64/wordsize-64 (i.e. alpha) starting to use the dbl-64/wordsize-64 versions of those functions (which is good, as an optimization, but still best separated from the present patch to get better validation). Tested for x86_64, and tested with build-many-glibcs.py that installed stripped shared libraries are unchanged by the patch. * sysdeps/ieee754/dbl-64/s_asinh.c: Include <libm-alias-double.h>. (asinh): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_cbrt.c: Include <libm-alias-double.h>. (cbrt): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_copysign.c: Include <libm-alias-double.h>. (copysign): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_erf.c: Include <libm-alias-double.h>. (erf): Define using libm_alias_double. (erfc): Likewise. * sysdeps/ieee754/dbl-64/s_expm1.c: Include <libm-alias-double.h>. (expm1): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_fabs.c: Include <libm-alias-double.h>. (fabs): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_fromfp.c (fromfp): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_fromfp_main.c: Include <libm-alias-double.h>. * sysdeps/ieee754/dbl-64/s_fromfpx.c (fromfpx): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_getpayload.c: Include <libm-alias-double.h>. (getpayload): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_llrint.c: Include <libm-alias-double.h>. (llrint): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_lrint.c: Include <libm-alias-double.h>. (lrint): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_nextup.c: Include <libm-alias-double.h>. (nextup): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_roundeven.c: Include <libm-alias-double.h>. (roundeven): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_setpayload.c (setpayload): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_setpayload_main.c: Include <libm-alias-double.h>. * sysdeps/ieee754/dbl-64/s_setpayloadsig.c (setpayloadsig): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_sin.c: Include <libm-alias-double.h>. (cos): Define using libm_alias_double. (sin): Likewise. * sysdeps/ieee754/dbl-64/s_sincos.c: Include <libm-alias-double.h>. (sincos): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_tanh.c: Include <libm-alias-double.h>. (tanh): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_totalorder.c: Include <libm-alias-double.h>. (totalorder): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_totalordermag.c: Include <libm-alias-double.h>. (totalordermag): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_ufromfp.c (ufromfp): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/s_ufromfpx.c (ufromfpx): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/wordsize-64/s_getpayload.c: Include <libm-alias-double.h>. (getpayload): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/wordsize-64/s_roundeven.c: Include <libm-alias-double.h>. (roundeven): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/wordsize-64/s_setpayload_main.c: Include <libm-alias-double.h>. * sysdeps/ieee754/dbl-64/wordsize-64/s_totalorder.c: Include <libm-alias-double.h>. (totalorder): Define using libm_alias_double. * sysdeps/ieee754/dbl-64/wordsize-64/s_totalordermag.c: Include <libm-alias-double.h>. (totalordermag): Define using libm_alias_double. * sysdeps/ieee754/ldbl-opt/s_copysign.c (copysignl): Only define libc compat symbol here. * sysdeps/ieee754/ldbl-opt/s_asinh.c: Remove file. * sysdeps/ieee754/ldbl-opt/s_cbrt.c: Likewise. * sysdeps/ieee754/ldbl-opt/s_erf.c: Likewise. * sysdeps/ieee754/ldbl-opt/s_expm1.c: Likewise. * sysdeps/ieee754/ldbl-opt/s_fabs.c: Likewise. * sysdeps/ieee754/ldbl-opt/s_llrint.c: Likewise. * sysdeps/ieee754/ldbl-opt/s_lrint.c: Likewise. * sysdeps/ieee754/ldbl-opt/s_sin.c: Likewise. * sysdeps/ieee754/ldbl-opt/s_sincos.c: Likewise. * sysdeps/ieee754/ldbl-opt/s_tanh.c: Likewise.
125 lines
3.3 KiB
C
125 lines
3.3 KiB
C
/* Round argument to nearest integral value according to current rounding
|
|
direction.
|
|
Copyright (C) 1997-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
|
|
|
|
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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <fenv.h>
|
|
#include <limits.h>
|
|
#include <math.h>
|
|
|
|
#include <math_private.h>
|
|
#include <libm-alias-double.h>
|
|
#include <fix-fp-int-convert-overflow.h>
|
|
|
|
static const double two52[2] =
|
|
{
|
|
4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */
|
|
-4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */
|
|
};
|
|
|
|
|
|
long int
|
|
__lrint (double x)
|
|
{
|
|
int32_t j0;
|
|
uint32_t i0, i1;
|
|
double w;
|
|
double t;
|
|
long int result;
|
|
int sx;
|
|
|
|
EXTRACT_WORDS (i0, i1, x);
|
|
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
|
|
sx = i0 >> 31;
|
|
i0 &= 0xfffff;
|
|
i0 |= 0x100000;
|
|
|
|
if (j0 < 20)
|
|
{
|
|
w = math_narrow_eval (two52[sx] + x);
|
|
t = w - two52[sx];
|
|
EXTRACT_WORDS (i0, i1, t);
|
|
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
|
|
i0 &= 0xfffff;
|
|
i0 |= 0x100000;
|
|
|
|
result = (j0 < 0 ? 0 : i0 >> (20 - j0));
|
|
}
|
|
else if (j0 < (int32_t) (8 * sizeof (long int)) - 1)
|
|
{
|
|
if (j0 >= 52)
|
|
result = ((long int) i0 << (j0 - 20)) | ((long int) i1 << (j0 - 52));
|
|
else
|
|
{
|
|
#if defined FE_INVALID || defined FE_INEXACT
|
|
/* X < LONG_MAX + 1 implied by J0 < 31. */
|
|
if (sizeof (long int) == 4
|
|
&& x > (double) LONG_MAX)
|
|
{
|
|
/* In the event of overflow we must raise the "invalid"
|
|
exception, but not "inexact". */
|
|
t = __nearbyint (x);
|
|
feraiseexcept (t == LONG_MAX ? FE_INEXACT : FE_INVALID);
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
w = math_narrow_eval (two52[sx] + x);
|
|
t = w - two52[sx];
|
|
}
|
|
EXTRACT_WORDS (i0, i1, t);
|
|
j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
|
|
i0 &= 0xfffff;
|
|
i0 |= 0x100000;
|
|
|
|
if (j0 == 20)
|
|
result = (long int) i0;
|
|
else
|
|
result = ((long int) i0 << (j0 - 20)) | (i1 >> (52 - j0));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* The number is too large. Unless it rounds to LONG_MIN,
|
|
FE_INVALID must be raised and the return value is
|
|
unspecified. */
|
|
#if defined FE_INVALID || defined FE_INEXACT
|
|
if (sizeof (long int) == 4
|
|
&& x < (double) LONG_MIN
|
|
&& x > (double) LONG_MIN - 1.0)
|
|
{
|
|
/* If truncation produces LONG_MIN, the cast will not raise
|
|
the exception, but may raise "inexact". */
|
|
t = __nearbyint (x);
|
|
feraiseexcept (t == LONG_MIN ? FE_INEXACT : FE_INVALID);
|
|
return LONG_MIN;
|
|
}
|
|
else if (FIX_DBL_LONG_CONVERT_OVERFLOW && x != (double) LONG_MIN)
|
|
{
|
|
feraiseexcept (FE_INVALID);
|
|
return sx == 0 ? LONG_MAX : LONG_MIN;
|
|
}
|
|
#endif
|
|
return (long int) x;
|
|
}
|
|
|
|
return sx ? -result : result;
|
|
}
|
|
|
|
libm_alias_double (__lrint, lrint)
|