X-Git-Url: http://nsz.repo.hu/git/?p=libc-test;a=blobdiff_plain;f=src%2Fmath%2Fround.c;h=495ad1dfae11621379abc3e7b9b6d364d8be9f12;hp=0535fd253000c8aa4634c2bda4432e7be2ac13be;hb=b55b931794bff9e88a3443daa8404c74f7f1d17c;hpb=4282b03a8c212b0e38af1876364be5f332673ce6

diff --git a/src/math/round.c b/src/math/round.c
index 0535fd2..495ad1d 100644
--- a/src/math/round.c
+++ b/src/math/round.c
@@ -1,14 +1,16 @@
 #include <stdint.h>
 #include <stdio.h>
-#include "util.h"
+#include "mtest.h"
 
 static struct d_d t[] = {
 #include "sanity/round.h"
+#include "special/round.h"
 
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	double y;
 	float d;
 	int e, i, err = 0;
@@ -16,18 +18,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 = round(p->x);
-		e = getexcept();
-		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s round(%a)==%a 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) && (e|INEXACT) != p->e) {
+			printf("%s:%d: bad fp exception: %s round(%a)=%a, want %s",
+				p->file, p->line, rstr(p->r), p->x, p->y, estr(p->e));
 			printf(" got %s\n", estr(e));
 			err++;
 		}
 		d = ulperr(y, p->y, p->dy);
-		if (!checkulp(d, p->r)) {
-			printf("%s round(%a) want %a got %a 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 round(%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++;
 		}
 	}