X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Ffrexpl.c;h=a0cb1b80b06797b695aa3755e10b86c922bfa54a;hb=05b75aa5eb2a9908495c341300a2acc19e9eaf4b;hp=9d56bf22c2e41e7afdffa34ce22fc0e8e6aacd22;hpb=75aab93ef75299e347be24f57223dc93f2af80a4;p=libc-test

diff --git a/src/math/frexpl.c b/src/math/frexpl.c
index 9d56bf2..a0cb1b8 100644
--- a/src/math/frexpl.c
+++ b/src/math/frexpl.c
@@ -1,19 +1,22 @@
 #include <stdint.h>
 #include <stdio.h>
-#include "util.h"
+#include "mtest.h"
 
 static struct l_li t[] = {
 #if LDBL_MANT_DIG == 53
 #include "sanity/frexp.h"
+#include "special/frexp.h"
 
 #elif LDBL_MANT_DIG == 64
 #include "sanity/frexpl.h"
+#include "special/frexpl.h"
 
 #endif
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	int yi;
 	long double y;
 	float d;
@@ -22,17 +25,22 @@ 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 = frexpl(p->x, &yi);
-		e = getexcept();
-		if (!checkexcept(e, p->e, p->r)) {
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
+		if (!checkexceptall(e, p->e, p->r)) {
 			printf("%s:%d: bad fp exception: %s frexpl(%La)=%La,%lld, want %s",
 				p->file, p->line, rstr(p->r), p->x, p->y, p->i, estr(p->e));
 			printf(" got %s\n", estr(e));
 			err++;
 		}
 		d = ulperrl(y, p->y, p->dy);
-		if (!checkulp(d, p->r) || yi != p->i) {
+		if (!checkcr(y, p->y, p->r) || (isfinite(p->x) && yi != p->i)) {
 			printf("%s:%d: %s frexpl(%La) want %La,%lld got %La,%d ulperr %.3f = %a + %a\n",
 				p->file, p->line, rstr(p->r), p->x, p->y, p->i, y, yi, d, d-p->dy, p->dy);
 			err++;