diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2006-08-23 23:57:02 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2006-08-23 23:57:02 +0000 |
commit | 3c2c20693b1c66193081a9c659470f0e8959a319 (patch) | |
tree | edf60c335edfc9b0255c5c691ce2b9debcc0b95b /libc/sysdeps/ieee754/ldbl-128 | |
parent | a67b488913fc7fe5f553f4ee98c21d9b04a3af7e (diff) |
[BZ #2592]
* math/libm-test.inc (lrint_test_tonearest): New.
(lrint_test_towardzero): New.
(lrint_test_downward): New.
(lrint_test_upward): New.
(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.
git-svn-id: svn://svn.eglibc.org/trunk@82 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/ieee754/ldbl-128')
-rw-r--r-- | libc/sysdeps/ieee754/ldbl-128/s_llrintl.c | 6 | ||||
-rw-r--r-- | libc/sysdeps/ieee754/ldbl-128/s_lrintl.c | 21 |
2 files changed, 11 insertions, 16 deletions
diff --git a/libc/sysdeps/ieee754/ldbl-128/s_llrintl.c b/libc/sysdeps/ieee754/ldbl-128/s_llrintl.c index ee66454e2..5804f57d1 100644 --- a/libc/sysdeps/ieee754/ldbl-128/s_llrintl.c +++ b/libc/sysdeps/ieee754/ldbl-128/s_llrintl.c @@ -48,8 +48,6 @@ __llrintl (long double x) if (j0 < (int32_t) (8 * sizeof (long long int)) - 1) { - if (j0 < -1) - return 0; w = two112[sx] + x; t = w - two112[sx]; GET_LDOUBLE_WORDS64 (i0, i1, t); @@ -57,7 +55,9 @@ __llrintl (long double x) i0 &= 0x0000ffffffffffffLL; i0 |= 0x0001000000000000LL; - if (j0 <= 48) + if (j0 < 0) + result = 0; + else if (j0 <= 48) result = i0 >> (48 - j0); else result = ((long long int) i0 << (j0 - 48)) | (i1 >> (112 - j0)); diff --git a/libc/sysdeps/ieee754/ldbl-128/s_lrintl.c b/libc/sysdeps/ieee754/ldbl-128/s_lrintl.c index 66f9a429f..53835a4bb 100644 --- a/libc/sysdeps/ieee754/ldbl-128/s_lrintl.c +++ b/libc/sysdeps/ieee754/ldbl-128/s_lrintl.c @@ -1,6 +1,6 @@ /* Round argument to nearest integral value according to current rounding direction. - Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc. + Copyright (C) 1997, 1999, 2004, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997 and Jakub Jelinek <jj@ultra.linux.cz>, 1999. @@ -48,19 +48,14 @@ __lrintl (long double x) if (j0 < 48) { - if (j0 < -1) - return 0; - else - { - w = two112[sx] + x; - t = w - two112[sx]; - GET_LDOUBLE_WORDS64 (i0, i1, x); - j0 = ((i0 >> 48) & 0x7fff) - 0x3fff; - i0 &= 0x0000ffffffffffffLL; - i0 |= 0x0001000000000000LL; + w = two112[sx] + x; + t = w - two112[sx]; + GET_LDOUBLE_WORDS64 (i0, i1, x); + j0 = ((i0 >> 48) & 0x7fff) - 0x3fff; + i0 &= 0x0000ffffffffffffLL; + i0 |= 0x0001000000000000LL; - result = i0 >> (48 - j0); - } + result = (j0 < 0 ? 0 : i0 >> (48 - j0)); } else if (j0 < (int32_t) (8 * sizeof (long int)) - 1) { |