X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Fexpl.c;h=e4d3065c72f9a3e954b2bddb79d8a8de5c5de77d;hb=f3f0ff4782fc90bd0f3e48fd541ee431f76aaed1;hp=68ad6452c30ffe1afa579feae12eef2673db6182;hpb=4282b03a8c212b0e38af1876364be5f332673ce6;p=libc-test

diff --git a/src/math/expl.c b/src/math/expl.c
index 68ad645..e4d3065 100644
--- a/src/math/expl.c
+++ b/src/math/expl.c
@@ -7,15 +7,18 @@ static struct l_l t[] = {
 #include "crlibm/exp.h"
 #include "ucb/exp.h"
 #include "sanity/exp.h"
+#include "special/exp.h"
 
 #elif LDBL_MANT_DIG == 64
 #include "sanity/expl.h"
+#include "special/expl.h"
 
 #endif
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	long double y;
 	float d;
 	int e, i, err = 0;
@@ -23,18 +26,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 = expl(p->x);
-		e = getexcept();
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
 		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s expl(%La)==%La except: want %s", rstr(p->r), p->x, p->y, estr(p->e));
+			printf("%s:%d: bad fp exception: %s expl(%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 expl(%La) want %La got %La ulperr %.3f = %a + %a\n",
-				rstr(p->r), p->x, p->y, y, d, d-p->dy, p->dy);
+			printf("%s:%d: %s expl(%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++;
 		}
 	}