diff options
| -rw-r--r-- | sysdeps/generic/math_private.h | 8 | ||||
| -rw-r--r-- | sysdeps/ieee754/flt-32/s_sinf.c | 13 | ||||
| -rw-r--r-- | sysdeps/x86_64/fpu/math_private.h | 17 |
3 files changed, 32 insertions, 6 deletions
diff --git a/sysdeps/generic/math_private.h b/sysdeps/generic/math_private.h index f29898c19c..a2cdce5b6a 100644 --- a/sysdeps/generic/math_private.h +++ b/sysdeps/generic/math_private.h @@ -184,6 +184,14 @@ do { \ } while (0) #endif +#ifndef FLOOR_DOUBLE_TO_INT +# define FLOOR_DOUBLE_TO_INT(x) ((int) __floor (x)) +#endif + +#ifndef FLOOR_INT_TO_DOUBLE_HALF +# define FLOOR_INT_TO_DOUBLE_HALF(x) __floor ((x) / 2.0) +#endif + /* We need to guarantee an expansion of name when building ldbl-128 files as another type (e.g _Float128). */ #define mathx_hidden_def(name) hidden_def(name) diff --git a/sysdeps/ieee754/flt-32/s_sinf.c b/sysdeps/ieee754/flt-32/s_sinf.c index 40d3d197a8..13a49ceb1b 100644 --- a/sysdeps/ieee754/flt-32/s_sinf.c +++ b/sysdeps/ieee754/flt-32/s_sinf.c @@ -85,8 +85,8 @@ static const int ones[] = { +1, -1 }; SIGNBIT is used to add the correct sign after the Chebyshev polynomial is computed. */ static inline float -reduced (const double theta, const unsigned long int n, - const unsigned long int signbit) +reduced (const double theta, const unsigned int n, + const unsigned int signbit) { double sx; const double theta2 = theta * theta; @@ -162,14 +162,14 @@ SINF_FUNC (float x) } else /* |x| >= Pi/4. */ { - unsigned long int signbit = (x < 0); + unsigned int signbit = (x < 0); if (abstheta < 9 * M_PI_4) /* |x| < 9*Pi/4. */ { /* There are cases where FE_UPWARD rounding mode can produce a result of abstheta * inv_PI_4 == 9, where abstheta < 9pi/4, so the domain for pio2_table must go to 5 (9 / 2 + 1). */ - unsigned long int n = (abstheta * inv_PI_4) + 1; + unsigned int n = (abstheta * inv_PI_4) + 1; theta = abstheta - pio2_table[n / 2]; return reduced (theta, n, signbit); } @@ -177,8 +177,9 @@ SINF_FUNC (float x) { if (abstheta < 0x1p+23) /* |x| < 2^23. */ { - unsigned long int n = __floor (abstheta * inv_PI_4) + 1.0; - double x = __floor (n / 2.0); + unsigned int n + = FLOOR_DOUBLE_TO_INT (abstheta * inv_PI_4) + 1.0; + double x = FLOOR_INT_TO_DOUBLE_HALF (n); theta = x * PI_2_lo + (x * PI_2_hi + abstheta); /* Argument reduction needed. */ return reduced (theta, n, signbit); diff --git a/sysdeps/x86_64/fpu/math_private.h b/sysdeps/x86_64/fpu/math_private.h index 027a6a3a4d..738897c9c6 100644 --- a/sysdeps/x86_64/fpu/math_private.h +++ b/sysdeps/x86_64/fpu/math_private.h @@ -45,6 +45,23 @@ f = f__; \ } while (0) +extern inline int +__floor_double_to_int (double x) +{ + return x; +} + +#define FLOOR_DOUBLE_TO_INT(x) __floor_double_to_int (x) + +extern inline double +__floor_int_to_double_half (int x) +{ + x /= 2; + return x; +} + +#define FLOOR_INT_TO_DOUBLE_HALF(x) __floor_int_to_double_half (x) + #include <sysdeps/i386/fpu/fenv_private.h> #include_next <math_private.h> |