From cec7d28af8ccb40dbf82d99efa13a040b31b9387 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 5 Oct 2015 22:53:50 +0000 Subject: Fix ldbl-96 lroundl just below powers of 2 (bug 19071). The ldbl-96 version of lroundl is incorrect for systems with 64-bit long when the argument's absolute value is just below a power of 2, 2^32 or more, and rounds up to the next integer; in such cases, it returns 0. The problem is incrementing the high part of the mantissa loses the high bit of the value (which is not an issue for any other floating-point format, and is handled specially in lround when the bit corresponding to 0.5 was in the high part rather than the low part). This patch fixes this in a similar way to that used in llroundl: storing the high part in an unsigned long variable before incrementing it, so problems cannot occur in the case when this code is reachable. I improved test coverage for both lround and llround by making them use the same test inputs (appropriately conditioned on the size of long in the lround case) - complete with the same comments, to make comparison as easy as possible. (This test coverage improvement was how I found the lroundl bug.) Tested for x86_64 and x86. [BZ #19071] * sysdeps/ieee754/ldbl-96/s_lroundl.c (__lroundl): Use unsigned long int variable to store possibly incremented high part of mantissa. * math/libm-test.inc (lround_test_data): Add tests used for llround. Use [LONG_MAX > 0x7fffffff] consistently as condition for tests requiring 64-bit long. Do not condition tests on [TEST_FLOAT] unnecessarily. (llround_test_data): Add tests used for lround. Add another expectation for the "inexact" exception. Do not condition tests on [TEST_FLOAT] unnecessarily. --- sysdeps/ieee754/ldbl-96/s_lroundl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sysdeps/ieee754/ldbl-96') diff --git a/sysdeps/ieee754/ldbl-96/s_lroundl.c b/sysdeps/ieee754/ldbl-96/s_lroundl.c index e34edd307d..7a59835783 100644 --- a/sysdeps/ieee754/ldbl-96/s_lroundl.c +++ b/sysdeps/ieee754/ldbl-96/s_lroundl.c @@ -58,13 +58,15 @@ __lroundl (long double x) else { u_int32_t j = i1 + (0x80000000 >> (j0 - 31)); + unsigned long int ures = i0; + if (j < i1) - ++i0; + ++ures; if (j0 == 31) - result = (long int) i0; + result = ures; else - result = ((long int) i0 << (j0 - 31)) | (j >> (63 - j0)); + result = (ures << (j0 - 31)) | (j >> (63 - j0)); } } else -- cgit 1.4.1