X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Facosf.c;h=0841db8d3b73880f193689c2e7b10295766d2f52;hb=4f18b8f0b3cf4a59aea5258adcdd32ba2a0b6741;hp=db12e883b016f70e83308cdbcaa00b32281097b1;hpb=4282b03a8c212b0e38af1876364be5f332673ce6;p=libc-test

diff --git a/src/math/acosf.c b/src/math/acosf.c
index db12e88..0841db8 100644
--- a/src/math/acosf.c
+++ b/src/math/acosf.c
@@ -1,15 +1,17 @@
 #include <stdint.h>
 #include <stdio.h>
-#include "util.h"
+#include "mtest.h"
 
 static struct f_f t[] = {
 #include "ucb/acosf.h"
 #include "sanity/acosf.h"
+#include "special/acosf.h"
 
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	float y;
 	float d;
 	int e, i, err = 0;
@@ -17,18 +19,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 = acosf(p->x);
-		e = getexcept();
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
 		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s acosf(%a)==%a except: want %s", rstr(p->r), p->x, p->y, estr(p->e));
+			printf("%s:%d: bad fp exception: %s acosf(%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 = ulperrf(y, p->y, p->dy);
 		if (!checkulp(d, p->r)) {
-			printf("%s acosf(%a) want %a got %a ulperr %.3f = %a + %a\n",
-				rstr(p->r), p->x, p->y, y, d, d-p->dy, p->dy);
+			printf("%s:%d: %s acosf(%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++;
 		}
 	}