X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Fexp2.c;h=f98a99577258525bdcb109a36844521ba1efac39;hb=8dc17fa12d0ed5d041e6521ebf3249ffd192c31b;hp=7892156c152b5397787941c18fd382f5a5f94857;hpb=4282b03a8c212b0e38af1876364be5f332673ce6;p=libc-test

diff --git a/src/math/exp2.c b/src/math/exp2.c
index 7892156..f98a995 100644
--- a/src/math/exp2.c
+++ b/src/math/exp2.c
@@ -1,14 +1,16 @@
 #include <stdint.h>
 #include <stdio.h>
-#include "util.h"
+#include "mtest.h"
 
 static struct d_d t[] = {
 #include "sanity/exp2.h"
+#include "special/exp2.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 = exp2(p->x);
-		e = getexcept();
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
 		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s exp2(%a)==%a except: want %s", rstr(p->r), p->x, p->y, estr(p->e));
+			printf("%s:%d: bad fp exception: %s exp2(%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 exp2(%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 exp2(%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++;
 		}
 	}