X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Fnextafter.c;h=02c6edcfb1619f8b3c68c418c0b1a44000417edb;hb=d22f4f43182fe1cc70b343b6a52cb8e3a54d1f44;hp=64524ee3e35333cd2de20131e78de389d1763378;hpb=f9d17902a35b6403b7c8354845e9f13f882c1c8e;p=libc-test

diff --git a/src/math/nextafter.c b/src/math/nextafter.c
index 64524ee..02c6edc 100644
--- a/src/math/nextafter.c
+++ b/src/math/nextafter.c
@@ -8,6 +8,7 @@ static struct dd_d t[] = {
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	double y;
 	float d;
 	int e, i, err = 0;
@@ -15,18 +16,24 @@ int main(void)
 
 	for (i = 0; i < sizeof t/sizeof *t; i++) {
 		p = t + i;
-		setupfenv(p->r);
+
+		if (p->r < 0)
+			continue;
+		fesetround(p->r);
+		feclearexcept(FE_ALL_EXCEPT);
 		y = nextafter(p->x, p->x2);
-		e = getexcept();
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
 		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s nextafter(%a,%a)==%a except: want %s", rstr(p->r), p->x, p->x2, p->y, estr(p->e));
+			printf("%s:%d: bad fp exception: %s nextafter(%a,%a)=%a, want %s",
+				p->file, p->line, rstr(p->r), p->x, p->x2, p->y, estr(p->e));
 			printf(" got %s\n", estr(e));
 			err++;
 		}
 		d = ulperr(y, p->y, p->dy);
 		if (!checkulp(d, p->r)) {
-			printf("%s nextafter(%a,%a) want %a got %a ulperr %.3f = %a + %a\n",
-				rstr(p->r), p->x, p->x2, p->y, y, d, d-p->dy, p->dy);
+			printf("%s:%d: %s nextafter(%a,%a) want %a got %a ulperr %.3f = %a + %a\n",
+				p->file, p->line, rstr(p->r), p->x, p->x2, p->y, y, d, d-p->dy, p->dy);
 			err++;
 		}
 	}