From 662ed2006568f953290f5e0b40cce38252db78f4 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Tue, 13 Nov 2012 10:12:07 +0100 Subject: [PATCH] math: fix nextafter and nexttoward on maxdbl and maxflt input old code (return x+x;) returns correct value and raises correct flags only if the result is stored as double (or float) --- src/math/nextafter.c | 2 +- src/math/nextafterf.c | 2 +- src/math/nexttoward.c | 2 +- src/math/nexttowardf.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/math/nextafter.c b/src/math/nextafter.c index a3b42c99..9ee82518 100644 --- a/src/math/nextafter.c +++ b/src/math/nextafter.c @@ -27,7 +27,7 @@ double nextafter(double x, double y) e = ux.bits >> 52 & 0x7ff; /* raise overflow if ux.value is infinite and x is finite */ if (e == 0x7ff) - return x + x; + FORCE_EVAL(x+x); /* raise underflow if ux.value is subnormal or zero */ if (e == 0) FORCE_EVAL(x*x + ux.value*ux.value); diff --git a/src/math/nextafterf.c b/src/math/nextafterf.c index b703487b..22b61dce 100644 --- a/src/math/nextafterf.c +++ b/src/math/nextafterf.c @@ -26,7 +26,7 @@ float nextafterf(float x, float y) e = ux.bits & 0x7f800000; /* raise overflow if ux.value is infinite and x is finite */ if (e == 0x7f800000) - return x + x; + FORCE_EVAL(x+x); /* raise underflow if ux.value is subnormal or zero */ if (e == 0) FORCE_EVAL(x*x + ux.value*ux.value); diff --git a/src/math/nexttoward.c b/src/math/nexttoward.c index 7355f2f1..6f32eca4 100644 --- a/src/math/nexttoward.c +++ b/src/math/nexttoward.c @@ -36,7 +36,7 @@ double nexttoward(double x, long double y) e = ux.bits>>52 & 0x7ff; /* raise overflow if ux.value is infinite and x is finite */ if (e == 0x7ff) - return x + x; + FORCE_EVAL(x+x); /* raise underflow if ux.value is subnormal or zero */ if (e == 0) FORCE_EVAL(x*x + ux.value*ux.value); diff --git a/src/math/nexttowardf.c b/src/math/nexttowardf.c index 8648be6a..9a693b1a 100644 --- a/src/math/nexttowardf.c +++ b/src/math/nexttowardf.c @@ -28,7 +28,7 @@ float nexttowardf(float x, long double y) e = ux.bits & 0x7f800000; /* raise overflow if ux.value is infinite and x is finite */ if (e == 0x7f800000) - return x + x; + FORCE_EVAL(x+x); /* raise underflow if ux.value is subnormal or zero */ if (e == 0) FORCE_EVAL(x*x + ux.value*ux.value); -- 2.25.1