diff options
Diffstat (limited to 'sysdeps/ieee754')
| -rw-r--r-- | sysdeps/ieee754/dbl-64/s_round.c | 10 | ||||
| -rw-r--r-- | sysdeps/ieee754/dbl-64/wordsize-64/s_round.c | 6 | ||||
| -rw-r--r-- | sysdeps/ieee754/flt-32/s_roundf.c | 7 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-128/s_roundl.c | 37 | ||||
| -rw-r--r-- | sysdeps/ieee754/ldbl-96/s_roundl.c | 8 |
5 files changed, 12 insertions, 56 deletions
diff --git a/sysdeps/ieee754/dbl-64/s_round.c b/sysdeps/ieee754/dbl-64/s_round.c index aeed6faf0e..4fe305b3ff 100644 --- a/sysdeps/ieee754/dbl-64/s_round.c +++ b/sysdeps/ieee754/dbl-64/s_round.c @@ -22,9 +22,6 @@ #include <math_private.h> -static const double huge = 1.0e300; - - double __round (double x) { @@ -37,8 +34,6 @@ __round (double x) { if (j0 < 0) { - math_force_eval (huge + x); - i0 &= 0x80000000; if (j0 == -1) i0 |= 0x3ff00000; @@ -50,9 +45,7 @@ __round (double x) if (((i0 & i) | i1) == 0) /* X is integral. */ return x; - math_force_eval (huge + x); - /* Raise inexact if x != 0. */ i0 += 0x00080000 >> j0; i0 &= ~i; i1 = 0; @@ -73,9 +66,6 @@ __round (double x) /* X is integral. */ return x; - math_force_eval (huge + x); - - /* Raise inexact if x != 0. */ u_int32_t j = i1 + (1 << (51 - j0)); if (j < i1) i0 += 1; diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_round.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_round.c index f1d75bbe68..688e6af016 100644 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_round.c +++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_round.c @@ -22,8 +22,6 @@ #include <math_private.h> #include <stdint.h> -static const double huge = 1.0e300; - double __round (double x) @@ -36,8 +34,6 @@ __round (double x) { if (j0 < 0) { - math_force_eval (huge + x); - i0 &= UINT64_C(0x8000000000000000); if (j0 == -1) i0 |= UINT64_C(0x3ff0000000000000); @@ -48,9 +44,7 @@ __round (double x) if ((i0 & i) == 0) /* X is integral. */ return x; - math_force_eval (huge + x); - /* Raise inexact if x != 0. */ i0 += UINT64_C(0x0008000000000000) >> j0; i0 &= ~i; } diff --git a/sysdeps/ieee754/flt-32/s_roundf.c b/sysdeps/ieee754/flt-32/s_roundf.c index a75d98f384..498aced30c 100644 --- a/sysdeps/ieee754/flt-32/s_roundf.c +++ b/sysdeps/ieee754/flt-32/s_roundf.c @@ -22,9 +22,6 @@ #include <math_private.h> -static const float huge = 1.0e30; - - float __roundf (float x) { @@ -36,8 +33,6 @@ __roundf (float x) { if (j0 < 0) { - math_force_eval (huge + x); - i0 &= 0x80000000; if (j0 == -1) i0 |= 0x3f800000; @@ -48,9 +43,7 @@ __roundf (float x) if ((i0 & i) == 0) /* X is integral. */ return x; - math_force_eval (huge + x); - /* Raise inexact if x != 0. */ i0 += 0x00400000 >> j0; i0 &= ~i; } diff --git a/sysdeps/ieee754/ldbl-128/s_roundl.c b/sysdeps/ieee754/ldbl-128/s_roundl.c index 98b448e4f3..63ffd73d7e 100644 --- a/sysdeps/ieee754/ldbl-128/s_roundl.c +++ b/sysdeps/ieee754/ldbl-128/s_roundl.c @@ -23,9 +23,6 @@ #include <math_private.h> -static const long double huge = 1.0E4930L; - - long double __roundl (long double x) { @@ -38,13 +35,10 @@ __roundl (long double x) { if (j0 < 0) { - if (huge + x > 0.0) - { - i0 &= 0x8000000000000000ULL; - if (j0 == -1) - i0 |= 0x3fff000000000000LL; - i1 = 0; - } + i0 &= 0x8000000000000000ULL; + if (j0 == -1) + i0 |= 0x3fff000000000000LL; + i1 = 0; } else { @@ -52,13 +46,10 @@ __roundl (long double x) if (((i0 & i) | i1) == 0) /* X is integral. */ return x; - if (huge + x > 0.0) - { - /* Raise inexact if x != 0. */ - i0 += 0x0000800000000000LL >> j0; - i0 &= ~i; - i1 = 0; - } + + i0 += 0x0000800000000000LL >> j0; + i0 &= ~i; + i1 = 0; } } else if (j0 > 111) @@ -76,14 +67,10 @@ __roundl (long double x) /* X is integral. */ return x; - if (huge + x > 0.0) - { - /* Raise inexact if x != 0. */ - u_int64_t j = i1 + (1LL << (111 - j0)); - if (j < i1) - i0 += 1; - i1 = j; - } + u_int64_t j = i1 + (1LL << (111 - j0)); + if (j < i1) + i0 += 1; + i1 = j; i1 &= ~i; } diff --git a/sysdeps/ieee754/ldbl-96/s_roundl.c b/sysdeps/ieee754/ldbl-96/s_roundl.c index 4f35c4847b..5a6988cd8b 100644 --- a/sysdeps/ieee754/ldbl-96/s_roundl.c +++ b/sysdeps/ieee754/ldbl-96/s_roundl.c @@ -22,9 +22,6 @@ #include <math_private.h> -static const long double huge = 1.0e4930L; - - long double __roundl (long double x) { @@ -37,7 +34,6 @@ __roundl (long double x) { if (j0 < 0) { - math_force_eval (huge + x); se &= 0x8000; i0 = i1 = 0; if (j0 == -1) @@ -53,8 +49,6 @@ __roundl (long double x) /* X is integral. */ return x; - /* Raise inexact if x != 0. */ - math_force_eval (huge + x); u_int32_t j = i0 + (0x40000000 >> j0); if (j < i0) se += 1; @@ -77,8 +71,6 @@ __roundl (long double x) /* X is integral. */ return x; - math_force_eval (huge + x); - /* Raise inexact if x != 0. */ u_int32_t j = i1 + (1 << (62 - j0)); if (j < i1) { |