X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmath%2Fnearbyintl.c;h=9350be6969c1a96b6e0726ad0e8cab1cc1b4309f;hb=c886bb85233e642ca37731de72ad3e1f2f18a2f3;hp=82bb73c6c9e13a8d75dc01136ab60d641044c1c9;hpb=4282b03a8c212b0e38af1876364be5f332673ce6;p=libc-test

diff --git a/src/math/nearbyintl.c b/src/math/nearbyintl.c
index 82bb73c..9350be6 100644
--- a/src/math/nearbyintl.c
+++ b/src/math/nearbyintl.c
@@ -5,15 +5,18 @@
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
 #include "sanity/nearbyint.h"
+#include "special/nearbyint.h"
 
 #elif LDBL_MANT_DIG == 64
 #include "sanity/nearbyintl.h"
+#include "special/nearbyintl.h"
 
 #endif
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	long double y;
 	float d;
 	int e, i, err = 0;
@@ -21,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 = nearbyintl(p->x);
-		e = getexcept();
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
 		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s nearbyintl(%La)==%La except: want %s", rstr(p->r), p->x, p->y, estr(p->e));
+			printf("%s:%d: bad fp exception: %s nearbyintl(%La)=%La, want %s",
+				p->file, p->line, rstr(p->r), p->x, 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 nearbyintl(%La) want %La got %La ulperr %.3f = %a + %a\n",
-				rstr(p->r), p->x, p->y, y, d, d-p->dy, p->dy);
+		if (!checkcr(y, p->y, p->r)) {
+			printf("%s:%d: %s nearbyintl(%La) want %La got %La ulperr %.3f = %a + %a\n",
+				p->file, p->line, rstr(p->r), p->x, p->y, y, d, d-p->dy, p->dy);
 			err++;
 		}
 	}