2003-12-07  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/i386/fpu/s_nexttowardf.c: Construct overflow value correctly.
	* sysdeps/i386/fpu/s_nexttoward.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_nexttoward.c: Likewise.
	* sysdeps/ieee754/ldbl-96/s_nexttoward.c: Likewise.
	* math/Makefile (tests): Add bug-nexttoward.
	* math/bug-nexttowward.c: New file.

	* sysdeps/generic/s_nextafter.c: Make sure overflow exception is set.
	* sysdeps/ieee754/flt-32/s_nextafterf.c: Likewise.
	* math/bug-nextafter.c (main): Add tests for overflow and negative
	values.
This commit is contained in:
Ulrich Drepper 2003-12-07 21:22:46 +00:00
parent 64b02fd2f5
commit 07449987c9
10 changed files with 152 additions and 18 deletions

View File

@ -1,3 +1,17 @@
2003-12-07 Ulrich Drepper <drepper@redhat.com>
* sysdeps/i386/fpu/s_nexttowardf.c: Construct overflow value correctly.
* sysdeps/i386/fpu/s_nexttoward.c: Likewise.
* sysdeps/ieee754/ldbl-128/s_nexttoward.c: Likewise.
* sysdeps/ieee754/ldbl-96/s_nexttoward.c: Likewise.
* math/Makefile (tests): Add bug-nexttoward.
* math/bug-nexttowward.c: New file.
* sysdeps/generic/s_nextafter.c: Make sure overflow exception is set.
* sysdeps/ieee754/flt-32/s_nextafterf.c: Likewise.
* math/bug-nextafter.c (main): Add tests for overflow and negative
values.
2003-12-06 Ulrich Drepper <drepper@redhat.com>
* math/Makefile (tests): Add bug-nextafter.

View File

@ -88,7 +88,7 @@ distribute += $(filter-out $(generated),$(long-m-yes:=.c) $(long-c-yes:=.c))
# Rules for the test suite.
tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
test-misc test-fpucw tst-definitions test-tgmath test-tgmath-ret \
bug-nextafter
bug-nextafter bug-nexttoward
# We do the `long double' tests only if this data type is available and
# distinct from `double'.
test-longdouble-yes = test-ldouble test-ildoubl

View File

@ -1,3 +1,4 @@
#include <fenv.h>
#include <math.h>
#include <float.h>
#include <stdlib.h>
@ -10,19 +11,53 @@ main (void)
float i = INFINITY;
float m = FLT_MAX;
feclearexcept (FE_ALL_EXCEPT);
if (nextafterf (m, i) != i)
{
puts ("nextafterf failed");
puts ("nextafterf+ failed");
++result;
}
if (fetestexcept (FE_OVERFLOW) != 0)
{
puts ("nextafterf+ did not overflow");
++result;
}
feclearexcept (FE_ALL_EXCEPT);
if (nextafterf (-m, -i) != -i)
{
puts ("nextafterf- failed");
++result;
}
if (fetestexcept (FE_OVERFLOW) != 0)
{
puts ("nextafterf- did not overflow");
++result;
}
double di = INFINITY;
double dm = DBL_MAX;
feclearexcept (FE_ALL_EXCEPT);
if (nextafter (dm, di) != di)
{
puts ("nextafter+ failed");
++result;
}
if (fetestexcept (FE_OVERFLOW) != 0)
{
puts ("nextafter+ did not overflow");
++result;
}
feclearexcept (FE_ALL_EXCEPT);
if (nextafter (-dm, -di) != -di)
{
puts ("nextafter failed");
++result;
}
if (fetestexcept (FE_OVERFLOW) != 0)
{
puts ("nextafter- did not overflow");
++result;
}
return result;
}

65
math/bug-nexttoward.c Normal file
View File

@ -0,0 +1,65 @@
#include <fenv.h>
#include <math.h>
#include <float.h>
#include <stdlib.h>
#include <stdio.h>
int
main (void)
{
int result = 0;
long double tl = (long double) FLT_MAX + 0x1.0p128L;
float fi = INFINITY;
float m = FLT_MAX;
feclearexcept (FE_ALL_EXCEPT);
if (nexttowardf (m, tl) != fi)
{
puts ("nexttowardf+ failed");
++result;
}
if (fetestexcept (FE_OVERFLOW) == 0)
{
puts ("nexttowardf+ did not overflow");
++result;
}
feclearexcept (FE_ALL_EXCEPT);
if (nexttowardf (-m, -tl) != -fi)
{
puts ("nexttowardf- failed");
++result;
}
if (fetestexcept (FE_OVERFLOW) == 0)
{
puts ("nexttowardf- did not overflow");
++result;
}
tl = (long double) DBL_MAX + 1.0e305L;
double di = INFINITY;
double dm = DBL_MAX;
feclearexcept (FE_ALL_EXCEPT);
if (nexttoward (dm, tl) != di)
{
puts ("nexttoward+ failed");
++result;
}
if (fetestexcept (FE_OVERFLOW) == 0)
{
puts ("nexttoward+ did not overflow");
++result;
}
feclearexcept (FE_ALL_EXCEPT);
if (nexttoward (-dm, -tl) != -di)
{
puts ("nexttoward- failed");
++result;
}
if (fetestexcept (FE_OVERFLOW) == 0)
{
puts ("nexttoward- did not overflow");
++result;
}
return result;
}

View File

@ -72,12 +72,10 @@ static char rcsid[] = "$NetBSD: s_nextafter.c,v 1.8 1995/05/10 20:47:58 jtc Exp
}
hy = hx&0x7ff00000;
if(hy>=0x7ff00000) {
#if FLT_EVAL_METHOD == 0 || FLT_EVAL_METHOD == 1
return x+x; /* overflow */
#else
/* Note that y is either +Inf or -Inf. */
return x+y;
#endif
x = x+x; /* overflow */
if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
asm ("" : "=m"(x) : "m"(x));
return x; /* overflow */
}
if(hy<0x00100000) { /* underflow */
y = x*x;

View File

@ -83,7 +83,12 @@ static char rcsid[] = "$NetBSD: $";
}
}
hy = hx&0x7ff00000;
if(hy>=0x7ff00000) return x+x; /* overflow */
if(hy>=0x7ff00000) {
x = x+x; /* overflow */
/* Force conversion to double. */
asm ("" : "=m"(x) : "m"(x));
return x;
}
if(hy<0x00100000) { /* underflow */
double x2 = x*x;
if(x2!=x) { /* raise underflow flag */

View File

@ -67,7 +67,12 @@ static char rcsid[] = "$NetBSD: $";
}
}
hy = hx&0x7f800000;
if(hy>=0x7f800000) return x+x; /* overflow */
if(hy>=0x7f800000) {
x = x+x; /* overflow */
/* Force conversion to float. */
asm ("" : "=m"(x) : "m"(x));
return x;
}
if(hy<0x00800000) { /* underflow */
float x2 = x*x;
if(x2!=x) { /* raise underflow flag */

View File

@ -59,12 +59,10 @@ static char rcsid[] = "$NetBSD: s_nextafterf.c,v 1.4 1995/05/10 20:48:01 jtc Exp
}
hy = hx&0x7f800000;
if(hy>=0x7f800000) {
#if FLT_EVAL_METHOD == 0
return x+x; /* overflow */
#else
/* Note that y is either +Inf or -Inf. */
return x+y;
#endif
x = x+x; /* overflow */
if (FLT_EVAL_METHOD != 0)
asm ("" : "=m"(x) : "m"(x));
return x; /* overflow */
}
if(hy<0x00800000) { /* underflow */
y = x*x;

View File

@ -27,6 +27,7 @@ static char rcsid[] = "$NetBSD: $";
#include "math.h"
#include "math_private.h"
#include <float.h>
#ifdef __STDC__
double __nexttoward(double x, long double y)
@ -83,7 +84,13 @@ static char rcsid[] = "$NetBSD: $";
}
}
hy = hx&0x7ff00000;
if(hy>=0x7ff00000) return x+x; /* overflow */
if(hy>=0x7ff00000) {
x = x+x; /* overflow */
if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
/* Force conversion to float. */
asm ("" : "=m"(x) : "m"(x));
return x;
}
if(hy<0x00100000) { /* underflow */
double x2 = x*x;
if(x2!=x) { /* raise underflow flag */

View File

@ -27,6 +27,7 @@ static char rcsid[] = "$NetBSD: $";
#include "math.h"
#include "math_private.h"
#include <float.h>
#ifdef __STDC__
double __nexttoward(double x, long double y)
@ -80,7 +81,13 @@ static char rcsid[] = "$NetBSD: $";
}
}
hy = hx&0x7ff00000;
if(hy>=0x7ff00000) return x+x; /* overflow */
if(hy>=0x7ff00000) {
x = x+x; /* overflow */
if (FLT_EVAL_METHOD != 0 && FLT_EVAL_METHOD != 1)
/* Force conversion to float. */
asm ("" : "=m"(x) : "m"(x));
return x;
}
if(hy<0x00100000) { /* underflow */
double x2 = x*x;
if(x2!=x) { /* raise underflow flag */