diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-03-11 22:24:00 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-03-11 22:24:00 +0000 |
| commit | 600fa36158cd741d897b2d22c735c60247b982e0 (patch) | |
| tree | 8e220cd7d1dc1619fd4cfb14b3f05a454f6ab813 /math | |
| parent | d7706c32589ef32f4bed3122a2f5c861b214149e (diff) | |
Fix nextafter overflow in non-default rounding modes (bug 16677).
ISO C requires the result of nextafter to be independent of the
rounding mode, even when underflow or overflow occurs. This patch
fixes the bug in various nextafter implementations that, having done
an overflowing computation to force an overflow exception (correct),
they then return the result of that computation rather than an
infinity computed some other way (incorrect, when the overflowing
result of arithmetic with that sign and rounding mode is finite but
the correct result is infinite) - generally by falling through to
existing code to return a value that in fact is correct for this case
(but was computed by an integer increment and so without generating
the exceptions required). Having fixed the bug, the previously
deferred conversion of nextafter testing in libm-test.inc to
ALL_RM_TEST is also included.
Tested x86_64 and x86; also spot-checked results of nextafter tests
for powerpc32 and mips64 to test the ldbl-128ibm and ldbl-128
changes. (The m68k change is untested.)
[BZ #16677]
* math/s_nextafter.c (__nextafter): Do not return value from
overflowing computation.
* sysdeps/i386/fpu/s_nextafterl.c (__nextafterl): Likewise.
* sysdeps/ieee754/flt-32/s_nextafterf.c (__nextafterf): Likewise.
* sysdeps/ieee754/ldbl-128/s_nextafterl.c (__nextafterl):
Likewise.
* sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c (__nextafterl):
Likewise.
* sysdeps/m68k/m680x0/fpu/s_nextafterl.c (__nextafterl): Likewise.
* math/libm-test.inc (nextafter_test): Use ALL_RM_TEST.
Diffstat (limited to 'math')
| -rw-r--r-- | math/libm-test.inc | 5 | ||||
| -rw-r--r-- | math/s_nextafter.c | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/math/libm-test.inc b/math/libm-test.inc index 0fe0f69e63..574654e222 100644 --- a/math/libm-test.inc +++ b/math/libm-test.inc @@ -9553,10 +9553,7 @@ static const struct test_ff_f_data nextafter_test_data[] = static void nextafter_test (void) { - - START (nextafter, 1); - RUN_TEST_LOOP_ff_f (nextafter, nextafter_test_data, ); - END; + ALL_RM_TEST (nextafter, 1, nextafter_test_data, RUN_TEST_LOOP_ff_f, END); } diff --git a/math/s_nextafter.c b/math/s_nextafter.c index 7b026f00ce..28962e52a7 100644 --- a/math/s_nextafter.c +++ b/math/s_nextafter.c @@ -70,10 +70,8 @@ double __nextafter(double x, double y) } hy = hx&0x7ff00000; if(hy>=0x7ff00000) { - x = x+x; /* overflow */ - if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1) - asm ("" : "+m"(x)); - return x; /* overflow */ + double u = x+x; /* overflow */ + math_force_eval (u); } if(hy<0x00100000) { double u = x*x; /* underflow */ |