diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-09-20 17:29:36 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-09-20 17:29:36 +0000 |
| commit | 6624dbc07b5a9fb316ed188ef01f65b8eea8b47c (patch) | |
| tree | d959e66afb360e3f4ef06bd5e20cffd7d10e2945 /sysdeps/ieee754/dbl-64 | |
| parent | 60cb50c7b678a1cd2d794f134b81bea53dcf84b0 (diff) | |
| download | glibc-6624dbc07b5a9fb316ed188ef01f65b8eea8b47c.tar glibc-6624dbc07b5a9fb316ed188ef01f65b8eea8b47c.tar.gz glibc-6624dbc07b5a9fb316ed188ef01f65b8eea8b47c.tar.bz2 glibc-6624dbc07b5a9fb316ed188ef01f65b8eea8b47c.zip | |
[BZ #2592]
2006-06-17 Joseph S. Myers <joseph@codesourcery.com>
[BZ #2592]
* math/libm-test.inc (lrint_test_tonearest): New function.
(lrint_test_towardzero): New function.
(lrint_test_downward): New function.
(lrint_test_upward): New function.
(main): Run these new tests.
* sysdeps/ieee754/dbl-64/s_llrint.c (__llrint): Correct rounding
of values near to 0.
(two52): Use double not long double.
* sysdeps/ieee754/dbl-64/s_lrint.c (__lrint): Likewise.
* sysdeps/ieee754/flt-32/s_llrintf.c (__llrintf): Likewise.
(two23): Use float not double.
* sysdeps/ieee754/flt-32/s_lrintf.c (__lrintf): Likewise.
(two23): Use float not double.
* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Likewise.
* sysdeps/ieee754/ldbl-128/s_lrintl.c (__lrintl): Likewise.
* sysdeps/ieee754/ldbl-96/s_llrintl.c (__llrintl): Likewise.
* sysdeps/ieee754/ldbl-96/s_lrintl.c (__lrintl): Likewise.
Diffstat (limited to 'sysdeps/ieee754/dbl-64')
| -rw-r--r-- | sysdeps/ieee754/dbl-64/s_llrint.c | 23 | ||||
| -rw-r--r-- | sysdeps/ieee754/dbl-64/s_lrint.c | 21 |
2 files changed, 17 insertions, 27 deletions
diff --git a/sysdeps/ieee754/dbl-64/s_llrint.c b/sysdeps/ieee754/dbl-64/s_llrint.c index 893bd716b5..64c870eaaa 100644 --- a/sysdeps/ieee754/dbl-64/s_llrint.c +++ b/sysdeps/ieee754/dbl-64/s_llrint.c @@ -1,6 +1,6 @@ /* Round argument to nearest integral value according to current rounding direction. - Copyright (C) 1997, 2004 Free Software Foundation, Inc. + Copyright (C) 1997, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -23,7 +23,7 @@ #include "math_private.h" -static const long double two52[2] = +static const double two52[2] = { 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ @@ -48,19 +48,14 @@ __llrint (double x) if (j0 < 20) { - if (j0 < -1) - return 0; - else - { - w = two52[sx] + x; - t = w - two52[sx]; - EXTRACT_WORDS (i0, i1, t); - j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; - i0 &= 0xfffff; - i0 |= 0x100000; + w = two52[sx] + x; + t = w - two52[sx]; + EXTRACT_WORDS (i0, i1, t); + j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; + i0 &= 0xfffff; + i0 |= 0x100000; - result = i0 >> (20 - j0); - } + result = (j0 < 0 ? 0 : i0 >> (20 - j0)); } else if (j0 < (int32_t) (8 * sizeof (long long int)) - 1) { diff --git a/sysdeps/ieee754/dbl-64/s_lrint.c b/sysdeps/ieee754/dbl-64/s_lrint.c index 2da68d4dcd..1084ed6e2d 100644 --- a/sysdeps/ieee754/dbl-64/s_lrint.c +++ b/sysdeps/ieee754/dbl-64/s_lrint.c @@ -1,6 +1,6 @@ /* Round argument to nearest integral value according to current rounding direction. - Copyright (C) 1997, 2004 Free Software Foundation, Inc. + Copyright (C) 1997, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -48,19 +48,14 @@ __lrint (double x) if (j0 < 20) { - if (j0 < -1) - return 0; - else - { - w = two52[sx] + x; - t = w - two52[sx]; - EXTRACT_WORDS (i0, i1, t); - j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; - i0 &= 0xfffff; - i0 |= 0x100000; + w = two52[sx] + x; + t = w - two52[sx]; + EXTRACT_WORDS (i0, i1, t); + j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; + i0 &= 0xfffff; + i0 |= 0x100000; - result = i0 >> (20 - j0); - } + result = (j0 < 0 ? 0 : i0 >> (20 - j0)); } else if (j0 < (int32_t) (8 * sizeof (long int)) - 1) { |