X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Fnearbyintl.c;h=9350be6969c1a96b6e0726ad0e8cab1cc1b4309f;hb=b3580f11bf7b91afd597e6224c2f265d6d0b087f;hp=d819f25320d8bb08efe402c64952e1f4b9f7c6af;hpb=457b0dbfc1d72080f6ba9fe47cd712e0f090732a;p=libc-test

diff --git a/src/math/nearbyintl.c b/src/math/nearbyintl.c
index d819f25..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,9 +24,14 @@ 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:%d: bad fp exception: %s nearbyintl(%La)=%La, want %s",
 				p->file, p->line, rstr(p->r), p->x, p->y, estr(p->e));
@@ -31,7 +39,7 @@ int main(void)
 			err++;
 		}
 		d = ulperrl(y, p->y, p->dy);
-		if (!checkulp(d, p->r)) {
+		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++;