From 07449987c90864fceb487994b4aaa5170803ab24 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 7 Dec 2003 21:22:46 +0000
Subject: Update.

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.
---
 sysdeps/generic/s_nextafter.c           | 10 ++++------
 sysdeps/i386/fpu/s_nexttoward.c         |  7 ++++++-
 sysdeps/i386/fpu/s_nexttowardf.c        |  7 ++++++-
 sysdeps/ieee754/flt-32/s_nextafterf.c   | 10 ++++------
 sysdeps/ieee754/ldbl-128/s_nexttoward.c |  9 ++++++++-
 sysdeps/ieee754/ldbl-96/s_nexttoward.c  |  9 ++++++++-
 6 files changed, 36 insertions(+), 16 deletions(-)

(limited to 'sysdeps')

diff --git a/sysdeps/generic/s_nextafter.c b/sysdeps/generic/s_nextafter.c
index 9290fc6568..c2d799d5df 100644
--- a/sysdeps/generic/s_nextafter.c
+++ b/sysdeps/generic/s_nextafter.c
@@ -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;
diff --git a/sysdeps/i386/fpu/s_nexttoward.c b/sysdeps/i386/fpu/s_nexttoward.c
index 6b18df1532..2bd768e448 100644
--- a/sysdeps/i386/fpu/s_nexttoward.c
+++ b/sysdeps/i386/fpu/s_nexttoward.c
@@ -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 */
diff --git a/sysdeps/i386/fpu/s_nexttowardf.c b/sysdeps/i386/fpu/s_nexttowardf.c
index 150641f335..3fbe53c338 100644
--- a/sysdeps/i386/fpu/s_nexttowardf.c
+++ b/sysdeps/i386/fpu/s_nexttowardf.c
@@ -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 */
diff --git a/sysdeps/ieee754/flt-32/s_nextafterf.c b/sysdeps/ieee754/flt-32/s_nextafterf.c
index e144e56acd..e1568e24c9 100644
--- a/sysdeps/ieee754/flt-32/s_nextafterf.c
+++ b/sysdeps/ieee754/flt-32/s_nextafterf.c
@@ -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;
diff --git a/sysdeps/ieee754/ldbl-128/s_nexttoward.c b/sysdeps/ieee754/ldbl-128/s_nexttoward.c
index 2c654fb973..553e401973 100644
--- a/sysdeps/ieee754/ldbl-128/s_nexttoward.c
+++ b/sysdeps/ieee754/ldbl-128/s_nexttoward.c
@@ -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 */
diff --git a/sysdeps/ieee754/ldbl-96/s_nexttoward.c b/sysdeps/ieee754/ldbl-96/s_nexttoward.c
index c29bcd146d..8b273af929 100644
--- a/sysdeps/ieee754/ldbl-96/s_nexttoward.c
+++ b/sysdeps/ieee754/ldbl-96/s_nexttoward.c
@@ -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 */
-- 
cgit v1.2.3