X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Fnextafterf.c;h=8a8033d73d304164c5849724dadbc9a5a46b05da;hb=125fb69ba64c0064de25eb1a23217b00aa393051;hp=71bf91b59b9152484e07ce33dabcfcd389660505;hpb=f9d17902a35b6403b7c8354845e9f13f882c1c8e;p=libc-test

diff --git a/src/math/nextafterf.c b/src/math/nextafterf.c
index 71bf91b..8a8033d 100644
--- a/src/math/nextafterf.c
+++ b/src/math/nextafterf.c
@@ -3,11 +3,13 @@
 #include "util.h"
 
 static struct ff_f t[] = {
+#include "sanity/nextafterf.h"
 
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	float y;
 	float d;
 	int e, i, err = 0;
@@ -15,18 +17,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 = nextafterf(p->x, p->x2);
-		e = getexcept();
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
 		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s nextafterf(%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 nextafterf(%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 = ulperrf(y, p->y, p->dy);
 		if (!checkulp(d, p->r)) {
-			printf("%s nextafterf(%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 nextafterf(%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++;
 		}
 	}