X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Fnextafterl.c;h=70fddb22d92e21f5d9557a80f33cce99868beb89;hb=029eccef78ac52d53eafdc391b2465f44e5a2ba0;hp=283e2ab560fa374eaf5062df87bc9a41b52e72c7;hpb=4282b03a8c212b0e38af1876364be5f332673ce6;p=libc-test

diff --git a/src/math/nextafterl.c b/src/math/nextafterl.c
index 283e2ab..70fddb2 100644
--- a/src/math/nextafterl.c
+++ b/src/math/nextafterl.c
@@ -4,14 +4,19 @@
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
+#include "sanity/nextafter.h"
+#include "special/nextafter.h"
 
 #elif LDBL_MANT_DIG == 64
+#include "sanity/nextafterl.h"
+#include "special/nextafterl.h"
 
 #endif
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	long double y;
 	float d;
 	int e, i, err = 0;
@@ -19,18 +24,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 = nextafterl(p->x, p->x2);
-		e = getexcept();
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
 		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s nextafterl(%La,%La)==%La except: want %s", rstr(p->r), p->x, p->x2, p->y, estr(p->e));
+			printf("%s:%d: bad fp exception: %s nextafterl(%La,%La)=%La, 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 = ulperrl(y, p->y, p->dy);
-		if (!checkulp(d, p->r)) {
-			printf("%s nextafterl(%La,%La) want %La got %La ulperr %.3f = %a + %a\n",
-				rstr(p->r), p->x, p->x2, p->y, y, d, d-p->dy, p->dy);
+		if (!checkcr(y, p->y, p->r)) {
+			printf("%s:%d: %s nextafterl(%La,%La) want %La got %La 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++;
 		}
 	}