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/flt-32/s_lrintf.c | |
parent | 60cb50c7b678a1cd2d794f134b81bea53dcf84b0 (diff) | |
download | glibc-6624dbc07b5a9fb316ed188ef01f65b8eea8b47c.tar.gz glibc-6624dbc07b5a9fb316ed188ef01f65b8eea8b47c.tar.xz 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/flt-32/s_lrintf.c')
-rw-r--r-- | sysdeps/ieee754/flt-32/s_lrintf.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sysdeps/ieee754/flt-32/s_lrintf.c b/sysdeps/ieee754/flt-32/s_lrintf.c index 2a156f7ce2..64486a4c3e 100644 --- a/sysdeps/ieee754/flt-32/s_lrintf.c +++ b/sysdeps/ieee754/flt-32/s_lrintf.c @@ -1,6 +1,6 @@ /* Round argument to nearest integral value according to current rounding direction. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 1997, 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 double two23[2] = +static const float two23[2] = { 8.3886080000e+06, /* 0x4B000000 */ -8.3886080000e+06, /* 0xCB000000 */ @@ -49,9 +49,7 @@ __lrintf (float x) if (j0 < (int32_t) (sizeof (long int) * 8) - 1) { - if (j0 < -1) - return 0; - else if (j0 >= 23) + if (j0 >= 23) result = (long int) i0 << (j0 - 23); else { @@ -62,7 +60,7 @@ __lrintf (float x) i0 &= 0x7fffff; i0 |= 0x800000; - result = i0 >> (23 - j0); + result = (j0 < 0 ? 0 : i0 >> (23 - j0)); } } else |