X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmath%2Froundl.c;h=53eda20ba34dbbc2f15915ff1d43f13fe2ee4fc9;hb=0d73b701b3c4bb8a200a35eed056ef6eef311713;hp=b0fdc992ad42f452dd1297ae56633dd8b4df767e;hpb=f9d17902a35b6403b7c8354845e9f13f882c1c8e;p=libc-test

diff --git a/src/math/roundl.c b/src/math/roundl.c
index b0fdc99..53eda20 100644
--- a/src/math/roundl.c
+++ b/src/math/roundl.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
-D
-#include "sanity/roundl.h"
-#elif LDBL_MANT_DIG == 64
+#include "sanity/round.h"
+#include "special/round.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/roundl.h"
+#include "special/roundl.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 = roundl(p->x);
-		e = getexcept();
-		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s roundl(%La)==%La except: want %s", rstr(p->r), p->x, p->y, estr(p->e));
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
+		if (!checkexceptall(e, p->e, p->r)) {
+			printf("%s:%d: bad fp exception: %s roundl(%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 roundl(%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 roundl(%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++;
 		}
 	}