From 600fa36158cd741d897b2d22c735c60247b982e0 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 11 Mar 2014 22:24:00 +0000 Subject: 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. --- sysdeps/i386/fpu/s_nextafterl.c | 5 ++++- sysdeps/ieee754/flt-32/s_nextafterf.c | 6 ++---- sysdeps/ieee754/ldbl-128/s_nextafterl.c | 5 ++++- sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c | 14 ++++++++++---- sysdeps/m68k/m680x0/fpu/s_nextafterl.c | 5 ++++- 5 files changed, 24 insertions(+), 11 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/i386/fpu/s_nextafterl.c b/sysdeps/i386/fpu/s_nextafterl.c index bafe7437fa..66d903f801 100644 --- a/sysdeps/i386/fpu/s_nextafterl.c +++ b/sysdeps/i386/fpu/s_nextafterl.c @@ -106,7 +106,10 @@ long double __nextafterl(long double x, long double y) } } esy = esx&0x7fff; - if(esy==0x7fff) return x+x; /* overflow */ + if(esy==0x7fff) { + long double u = x + x; /* overflow */ + math_force_eval (u); + } if(esy==0) { long double u = x*x; /* underflow */ math_force_eval (u); /* raise underflow flag */ diff --git a/sysdeps/ieee754/flt-32/s_nextafterf.c b/sysdeps/ieee754/flt-32/s_nextafterf.c index b0de3d9ce2..22e0b3d4ed 100644 --- a/sysdeps/ieee754/flt-32/s_nextafterf.c +++ b/sysdeps/ieee754/flt-32/s_nextafterf.c @@ -57,10 +57,8 @@ float __nextafterf(float x, float y) } hy = hx&0x7f800000; if(hy>=0x7f800000) { - x = x+x; /* overflow */ - if (FLT_EVAL_METHOD != 0) - asm ("" : "+m"(x)); - return x; /* overflow */ + float u = x+x; /* overflow */ + math_force_eval (u); } if(hy<0x00800000) { float u = x*x; /* underflow */ diff --git a/sysdeps/ieee754/ldbl-128/s_nextafterl.c b/sysdeps/ieee754/ldbl-128/s_nextafterl.c index e345bc8c40..d5eaa1cc91 100644 --- a/sysdeps/ieee754/ldbl-128/s_nextafterl.c +++ b/sysdeps/ieee754/ldbl-128/s_nextafterl.c @@ -67,7 +67,10 @@ long double __nextafterl(long double x, long double y) } } hy = hx&0x7fff000000000000LL; - if(hy==0x7fff000000000000LL) return x+x;/* overflow */ + if(hy==0x7fff000000000000LL) { + long double u = x + x; /* overflow */ + math_force_eval (u); + } if(hy==0) { long double u = x*x; /* underflow */ math_force_eval (u); /* raise underflow flag */ diff --git a/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c b/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c index c050944c0c..30b1540a88 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_nextafterl.c @@ -66,8 +66,11 @@ long double __nextafterl(long double x, long double y) long double with a 106 bit mantissa, and nextafterl is insane with variable precision. So to make nextafterl sane we assume 106 bit precision. */ - if((hx==0xffefffffffffffffLL)&&(lx==0xfc8ffffffffffffeLL)) - return x+x; /* overflow, return -inf */ + if((hx==0xffefffffffffffffLL)&&(lx==0xfc8ffffffffffffeLL)) { + u = x+x; /* overflow, return -inf */ + math_force_eval (u); + return y; + } if (hx >= 0x7ff0000000000000LL) { u = 0x1.fffffffffffff7ffffffffffff8p+1023L; return u; @@ -93,8 +96,11 @@ long double __nextafterl(long double x, long double y) } return x - u; } else { /* x < y, x += ulp */ - if((hx==0x7fefffffffffffffLL)&&(lx==0x7c8ffffffffffffeLL)) - return x+x; /* overflow, return +inf */ + if((hx==0x7fefffffffffffffLL)&&(lx==0x7c8ffffffffffffeLL)) { + u = x+x; /* overflow, return +inf */ + math_force_eval (u); + return y; + } if ((uint64_t) hx >= 0xfff0000000000000ULL) { u = -0x1.fffffffffffff7ffffffffffff8p+1023L; return u; diff --git a/sysdeps/m68k/m680x0/fpu/s_nextafterl.c b/sysdeps/m68k/m680x0/fpu/s_nextafterl.c index 03c136bb08..ad77ca4f67 100644 --- a/sysdeps/m68k/m680x0/fpu/s_nextafterl.c +++ b/sysdeps/m68k/m680x0/fpu/s_nextafterl.c @@ -89,7 +89,10 @@ long double __nextafterl(long double x, long double y) } } esy = esx&0x7fff; - if(esy==0x7fff) return x+x; /* overflow */ + if(esy==0x7fff) { + long double u = x + x; /* overflow */ + math_force_eval (u); + } if(esy==0 && (hx & 0x80000000) == 0) { /* underflow */ y = x*x; math_force_eval (y); /* raise underflow flag */ -- cgit 1.4.1