mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +00:00
b4d5b8b021
This patch continues the math_private.h cleanup by stopping math_private.h from including math-barriers.h and making the users of the barrier macros include the latter header directly. No attempt is made to remove any math_private.h includes that are now unused, except in strtod_l.c where that is done to avoid line number changes in assertions, so that installed stripped shared libraries can be compared before and after the patch. (I think the floating-point environment support in math_private.h should also move out - some architectures already have fenv_private.h as an architecture-internal header included from their math_private.h - and after moving that out might be a better time to identify unused math_private.h includes.) Tested for x86_64 and x86, and tested with build-many-glibcs.py that installed stripped shared libraries are unchanged by the patch. * sysdeps/generic/math_private.h: Do not include <math-barriers.h>. * stdlib/strtod_l.c: Include <math-barriers.h> instead of <math_private.h>. * math/fromfp.h: Include <math-barriers.h>. * math/math-narrow.h: Likewise. * math/s_nextafter.c: Likewise. * math/s_nexttowardf.c: Likewise. * sysdeps/aarch64/fpu/s_llrint.c: Likewise. * sysdeps/aarch64/fpu/s_llrintf.c: Likewise. * sysdeps/aarch64/fpu/s_lrint.c: Likewise. * sysdeps/aarch64/fpu/s_lrintf.c: Likewise. * sysdeps/i386/fpu/s_nextafterl.c: Likewise. * sysdeps/i386/fpu/s_nexttoward.c: Likewise. * sysdeps/i386/fpu/s_nexttowardf.c: Likewise. * sysdeps/ieee754/dbl-64/e_atan2.c: Likewise. * sysdeps/ieee754/dbl-64/e_atanh.c: Likewise. * sysdeps/ieee754/dbl-64/e_exp.c: Likewise. * sysdeps/ieee754/dbl-64/e_exp2.c: Likewise. * sysdeps/ieee754/dbl-64/e_j0.c: Likewise. * sysdeps/ieee754/dbl-64/e_sqrt.c: Likewise. * sysdeps/ieee754/dbl-64/s_expm1.c: Likewise. * sysdeps/ieee754/dbl-64/s_fma.c: Likewise. * sysdeps/ieee754/dbl-64/s_fmaf.c: Likewise. * sysdeps/ieee754/dbl-64/s_log1p.c: Likewise. * sysdeps/ieee754/dbl-64/s_nearbyint.c: Likewise. * sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c: Likewise. * sysdeps/ieee754/flt-32/e_atanhf.c: Likewise. * sysdeps/ieee754/flt-32/e_j0f.c: Likewise. * sysdeps/ieee754/flt-32/s_expm1f.c: Likewise. * sysdeps/ieee754/flt-32/s_log1pf.c: Likewise. * sysdeps/ieee754/flt-32/s_nearbyintf.c: Likewise. * sysdeps/ieee754/flt-32/s_nextafterf.c: Likewise. * sysdeps/ieee754/k_standardl.c: Likewise. * sysdeps/ieee754/ldbl-128/e_asinl.c: Likewise. * sysdeps/ieee754/ldbl-128/e_expl.c: Likewise. * sysdeps/ieee754/ldbl-128/e_powl.c: Likewise. * sysdeps/ieee754/ldbl-128/s_fmal.c: Likewise. * sysdeps/ieee754/ldbl-128/s_nearbyintl.c: Likewise. * sysdeps/ieee754/ldbl-128/s_nextafterl.c: Likewise. * sysdeps/ieee754/ldbl-128/s_nexttoward.c: Likewise. * sysdeps/ieee754/ldbl-128/s_nexttowardf.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/e_asinl.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_fmal.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_nexttoward.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_nexttowardf.c: Likewise. * sysdeps/ieee754/ldbl-128ibm/s_rintl.c: Likewise. * sysdeps/ieee754/ldbl-96/e_atanhl.c: Likewise. * sysdeps/ieee754/ldbl-96/e_j0l.c: Likewise. * sysdeps/ieee754/ldbl-96/s_fma.c: Likewise. * sysdeps/ieee754/ldbl-96/s_fmal.c: Likewise. * sysdeps/ieee754/ldbl-96/s_nexttoward.c: Likewise. * sysdeps/ieee754/ldbl-96/s_nexttowardf.c: Likewise. * sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c: Likewise. * sysdeps/m68k/m680x0/fpu/s_nextafterl.c: Likewise.
176 lines
5.7 KiB
C
176 lines
5.7 KiB
C
/* Round to integer type. Common helper functions.
|
|
Copyright (C) 2016-2018 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <fenv.h>
|
|
#include <float.h>
|
|
#include <math.h>
|
|
#include <math-barriers.h>
|
|
#include <math_private.h>
|
|
#include <stdbool.h>
|
|
#include <stdint.h>
|
|
|
|
/* The including file should have defined UNSIGNED to 0 (signed return
|
|
type) or 1 (unsigned return type), INEXACT to 0 (no inexact
|
|
exceptions) or 1 (raise inexact exceptions) and RET_TYPE to the
|
|
return type (intmax_t or uintmax_t). */
|
|
|
|
/* Return the maximum unbiased exponent for an argument (negative if
|
|
NEGATIVE is set) that might be in range for a call to a fromfp
|
|
function with width WIDTH (greater than 0, and not exceeding that
|
|
of intmax_t). The truncated argument may still be out of range in
|
|
the case of negative arguments, and if not out of range it may
|
|
become out of range as a result of rounding. */
|
|
|
|
static int
|
|
fromfp_max_exponent (bool negative, int width)
|
|
{
|
|
if (UNSIGNED)
|
|
return negative ? -1 : width - 1;
|
|
else
|
|
return negative ? width - 1 : width - 2;
|
|
}
|
|
|
|
/* Return the result of rounding an integer value X (passed as the
|
|
absolute value; NEGATIVE is true if the value is negative), where
|
|
HALF_BIT is true if the bit with value 0.5 is set and MORE_BITS is
|
|
true if any lower bits are set, in the rounding direction
|
|
ROUND. */
|
|
|
|
static uintmax_t
|
|
fromfp_round (bool negative, uintmax_t x, bool half_bit, bool more_bits,
|
|
int round)
|
|
{
|
|
switch (round)
|
|
{
|
|
case FP_INT_UPWARD:
|
|
return x + (!negative && (half_bit || more_bits));
|
|
|
|
case FP_INT_DOWNWARD:
|
|
return x + (negative && (half_bit || more_bits));
|
|
|
|
case FP_INT_TOWARDZERO:
|
|
default:
|
|
/* Unknown rounding directions are defined to mean unspecified
|
|
rounding; treat this as truncation. */
|
|
return x;
|
|
|
|
case FP_INT_TONEARESTFROMZERO:
|
|
return x + half_bit;
|
|
|
|
case FP_INT_TONEAREST:
|
|
return x + (half_bit && ((x & 1) || more_bits));
|
|
}
|
|
}
|
|
|
|
/* Integer rounding, of a value whose exponent EXPONENT did not exceed
|
|
the maximum exponent MAX_EXPONENT and so did not necessarily
|
|
overflow, has produced X (possibly wrapping to 0); the sign is
|
|
negative if NEGATIVE is true. Return whether this overflowed the
|
|
allowed width. */
|
|
|
|
static bool
|
|
fromfp_overflowed (bool negative, uintmax_t x, int exponent, int max_exponent)
|
|
{
|
|
if (UNSIGNED)
|
|
{
|
|
if (negative)
|
|
return x != 0;
|
|
else if (max_exponent == INTMAX_WIDTH - 1)
|
|
return exponent == INTMAX_WIDTH - 1 && x == 0;
|
|
else
|
|
return x == (1ULL << (max_exponent + 1));
|
|
}
|
|
else
|
|
{
|
|
if (negative)
|
|
return exponent == max_exponent && x != (1ULL << max_exponent);
|
|
else
|
|
return x == (1ULL << (max_exponent + 1));
|
|
}
|
|
}
|
|
|
|
/* Handle a domain error for a call to a fromfp function with an
|
|
argument which is negative if NEGATIVE is set, and specified width
|
|
(not exceeding that of intmax_t) WIDTH. The return value is
|
|
unspecified (with it being unclear if the result needs to fit
|
|
within WIDTH bits in this case); we choose to saturate to the given
|
|
number of bits (treating NaNs like any other value). */
|
|
|
|
static RET_TYPE
|
|
fromfp_domain_error (bool negative, unsigned int width)
|
|
{
|
|
feraiseexcept (FE_INVALID);
|
|
__set_errno (EDOM);
|
|
/* The return value is unspecified; we choose to saturate to the
|
|
given number of bits (treating NaNs like any other value). */
|
|
if (UNSIGNED)
|
|
{
|
|
if (negative)
|
|
return 0;
|
|
else if (width == INTMAX_WIDTH)
|
|
return -1;
|
|
else
|
|
return (1ULL << width) - 1;
|
|
}
|
|
else
|
|
{
|
|
if (width == 0)
|
|
return 0;
|
|
else if (negative)
|
|
return -(1ULL << (width - 1));
|
|
else
|
|
return (1ULL << (width - 1)) - 1;
|
|
}
|
|
}
|
|
|
|
/* Given X, the absolute value of a floating-point number (negative if
|
|
NEGATIVE is set) truncated towards zero, where HALF_BIT is true if
|
|
the bit with value 0.5 is set and MORE_BITS is true if any lower
|
|
bits are set, round it in the rounding direction ROUND, handle
|
|
errors and exceptions and return the appropriate return value for a
|
|
fromfp function. X originally had floating-point exponent
|
|
EXPONENT, which does not exceed MAX_EXPONENT, the return value from
|
|
fromfp_max_exponent with width WIDTH. */
|
|
|
|
static RET_TYPE
|
|
fromfp_round_and_return (bool negative, uintmax_t x, bool half_bit,
|
|
bool more_bits, int round, int exponent,
|
|
int max_exponent, unsigned int width)
|
|
{
|
|
uintmax_t uret = fromfp_round (negative, x, half_bit, more_bits, round);
|
|
if (fromfp_overflowed (negative, uret, exponent, max_exponent))
|
|
return fromfp_domain_error (negative, width);
|
|
|
|
if (INEXACT && (half_bit || more_bits))
|
|
{
|
|
/* There is no need for this to use the specific floating-point
|
|
type for which this header is included, and there is no need
|
|
for this header to know that type at all, so just use float
|
|
here. */
|
|
float force_inexact = 1.0f + FLT_MIN;
|
|
math_force_eval (force_inexact);
|
|
}
|
|
if (UNSIGNED)
|
|
/* A negative argument not rounding to zero will already have
|
|
produced a domain error. */
|
|
return uret;
|
|
else
|
|
return negative ? -uret : uret;
|
|
}
|