qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove dbl-64/wordsize-64 

Remove the wordsize-64 implementations by merging them into the main dbl-64
directory.  The first patch adds special cases needed for 32-bit targets
(FIX_INT_FP_CONVERT_ZERO and FIX_DBL_LONG_CONVERT_OVERFLOW) to the
wordsize-64 versions.  This has no effect on 64-bit targets since they don't
define these macros.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Wilco Dijkstra 2021-01-07 15:02:51 +00:00
parent 3016596a81
commit caa884dda7
4 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysdeps/ieee754/dbl-64/wordsize-64/e_log10.c
View File

@ -44,6 +44,7 @@
*/ */
#include <math.h> #include <math.h>
#include <fix-int-fp-convert-zero.h>
#include <math_private.h> #include <math_private.h>
#include <stdint.h> #include <stdint.h>
#include <libm-alias-finite.h> #include <libm-alias-finite.h>
@ -80,6 +81,8 @@ __ieee754_log10 (double x)
i = ((uint64_t) k & UINT64_C(0x8000000000000000)) >> 63; i = ((uint64_t) k & UINT64_C(0x8000000000000000)) >> 63;
hx = (hx & UINT64_C(0x000fffffffffffff)) | ((0x3ff - i) << 52); hx = (hx & UINT64_C(0x000fffffffffffff)) | ((0x3ff - i) << 52);
y = (double) (k + i); y = (double) (k + i);
if (FIX_INT_FP_CONVERT_ZERO && y == 0.0)
y = 0.0;
INSERT_WORDS64 (x, hx); INSERT_WORDS64 (x, hx);
z = y * log10_2lo + ivln10 * __ieee754_log (x); z = y * log10_2lo + ivln10 * __ieee754_log (x);
return z + y * log10_2hi; return z + y * log10_2hi;

3
sysdeps/ieee754/dbl-64/wordsize-64/s_getpayload.c
View File

@ -20,6 +20,7 @@
#include <math_private.h> #include <math_private.h>
#include <libm-alias-double.h> #include <libm-alias-double.h>
#include <stdint.h> #include <stdint.h>
#include <fix-int-fp-convert-zero.h>
double double
__getpayload (const double *x) __getpayload (const double *x)
@ -30,6 +31,8 @@ __getpayload (const double *x)
|| (ix & 0xfffffffffffffULL) == 0) || (ix & 0xfffffffffffffULL) == 0)
return -1; return -1;
ix &= 0x7ffffffffffffULL; ix &= 0x7ffffffffffffULL;
if (FIX_INT_FP_CONVERT_ZERO && ix == 0)
return 0.0f;
return (double) ix; return (double) ix;
} }
libm_alias_double (__getpayload, getpayload) libm_alias_double (__getpayload, getpayload)

16
sysdeps/ieee754/dbl-64/wordsize-64/s_llround.c
View File

@ -20,12 +20,14 @@
#define lround __hidden_lround #define lround __hidden_lround
#define __lround __hidden___lround #define __lround __hidden___lround
#include <fenv.h>
#include <limits.h>
#include <math.h> #include <math.h>
#include <sysdep.h> #include <sysdep.h>
#include <math_private.h> #include <math_private.h>
#include <libm-alias-double.h> #include <libm-alias-double.h>
#include <fix-fp-int-convert-overflow.h>
long long int long long int
__llround (double x) __llround (double x)
@ -56,8 +58,16 @@ __llround (double x)
} }
else else
{ {
/* The number is too large. It is left implementation defined #ifdef FE_INVALID
what happens. */ /* The number is too large. Unless it rounds to LLONG_MIN,
FE_INVALID must be raised and the return value is
unspecified. */
if (FIX_DBL_LLONG_CONVERT_OVERFLOW && x != (double) LLONG_MIN)
{
feraiseexcept (FE_INVALID);
return sign == 1 ? LLONG_MAX : LLONG_MIN;
}
#endif
return (long long int) x; return (long long int) x;
} }

13
sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c
View File

@ -22,6 +22,7 @@
#include <math_private.h> #include <math_private.h>
#include <libm-alias-double.h> #include <libm-alias-double.h>
#include <fix-fp-int-convert-overflow.h>
/* For LP64, lround is an alias for llround. */ /* For LP64, lround is an alias for llround. */
#ifndef _LP64 #ifndef _LP64
@ -66,7 +67,17 @@ __lround (double x)
FE_INVALID must be raised and the return value is FE_INVALID must be raised and the return value is
unspecified. */ unspecified. */
#ifdef FE_INVALID #ifdef FE_INVALID
if (sizeof (long int) == 4 if (FIX_DBL_LONG_CONVERT_OVERFLOW
&& !(sign == -1
&& (sizeof (long int) == 4
? x > (double) LONG_MIN - 0.5
: x >= (double) LONG_MIN)))
{
feraiseexcept (FE_INVALID);
return sign == 1 ? LONG_MAX : LONG_MIN;
}
else if (!FIX_DBL_LONG_CONVERT_OVERFLOW
&& sizeof (long int) == 4
&& x <= (double) LONG_MIN - 0.5) && x <= (double) LONG_MIN - 0.5)
{ {
/* If truncation produces LONG_MIN, the cast will not raise /* If truncation produces LONG_MIN, the cast will not raise