X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmath%2Flogbl.c;h=8a774c7210a673f56b8d4a319fa61691280358ec;hb=2a67607b30e4a76fc176decc7a1bc03a3bbfea73;hp=149d19fa54de5a86d2e090fbf8eed3d1ebc0859e;hpb=4282b03a8c212b0e38af1876364be5f332673ce6;p=libc-test

diff --git a/src/math/logbl.c b/src/math/logbl.c
index 149d19f..8a774c7 100644
--- a/src/math/logbl.c
+++ b/src/math/logbl.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
 #include "sanity/logb.h"
+#include "special/logb.h"
 
 #elif LDBL_MANT_DIG == 64
 #include "sanity/logbl.h"
+#include "special/logbl.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 = logbl(p->x);
-		e = getexcept();
-		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s logbl(%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 logbl(%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 logbl(%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 logbl(%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++;
 		}
 	}