X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Frintl.c;h=2970eb35d83991b177cfccabdd372a2102937152;hb=32fca61b208425e16262e4d007dabad44bcd872b;hp=331796cabef304ced748d17bcb9401aeca1e74d5;hpb=457b0dbfc1d72080f6ba9fe47cd712e0f090732a;p=libc-test

diff --git a/src/math/rintl.c b/src/math/rintl.c
index 331796c..2970eb3 100644
--- a/src/math/rintl.c
+++ b/src/math/rintl.c
@@ -1,19 +1,22 @@
 #include <stdint.h>
 #include <stdio.h>
-#include "util.h"
+#include "mtest.h"
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
 #include "sanity/rint.h"
+#include "special/rint.h"
 
 #elif LDBL_MANT_DIG == 64
 #include "sanity/rintl.h"
+#include "special/rintl.h"
 
 #endif
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	long double y;
 	float d;
 	int e, i, err = 0;
@@ -21,17 +24,22 @@ 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 = rintl(p->x);
-		e = getexcept();
-		if (!checkexcept(e, p->e, p->r)) {
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
+		if (!checkexceptall(e, p->e, p->r)) {
 			printf("%s:%d: bad fp exception: %s rintl(%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)) {
+		if (!checkcr(y, p->y, p->r)) {
 			printf("%s:%d: %s rintl(%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++;