X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Frintf.c;h=627c242c1916bb61b014d00e14b97eeca4c8e68d;hb=ae0f0fe09b7fc9d44d072c3fd08372991d852b1d;hp=707fdb13d92d7cd68112df2cb03ba9c1cdcfac48;hpb=457b0dbfc1d72080f6ba9fe47cd712e0f090732a;p=libc-test

diff --git a/src/math/rintf.c b/src/math/rintf.c
index 707fdb1..627c242 100644
--- a/src/math/rintf.c
+++ b/src/math/rintf.c
@@ -4,11 +4,13 @@
 
 static struct f_f t[] = {
 #include "sanity/rintf.h"
+#include "special/rintf.h"
 
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	float y;
 	float d;
 	int e, i, err = 0;
@@ -16,9 +18,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 = rintf(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 rintf(%a)=%a, want %s",
 				p->file, p->line, rstr(p->r), p->x, p->y, estr(p->e));
@@ -26,7 +33,7 @@ int main(void)
 			err++;
 		}
 		d = ulperrf(y, p->y, p->dy);
-		if (!checkulp(d, p->r)) {
+		if (!checkcr(y, p->y, p->r)) {
 			printf("%s:%d: %s rintf(%a) want %a got %a ulperr %.3f = %a + %a\n",
 				p->file, p->line, rstr(p->r), p->x, p->y, y, d, d-p->dy, p->dy);
 			err++;