X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Ffrexp.c;h=5ba58ffe9f16e04df3fa9d81b78708887f7b3004;hb=4b4849e54740efe153632dfb14052d7210cea6c6;hp=19bc4011be2303dda1b48b060f007bdf10573891;hpb=75aab93ef75299e347be24f57223dc93f2af80a4;p=libc-test

diff --git a/src/math/frexp.c b/src/math/frexp.c
index 19bc401..5ba58ff 100644
--- a/src/math/frexp.c
+++ b/src/math/frexp.c
@@ -1,14 +1,16 @@
 #include <stdint.h>
 #include <stdio.h>
-#include "util.h"
+#include "mtest.h"
 
 static struct d_di t[] = {
 #include "sanity/frexp.h"
+#include "special/frexp.h"
 
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	int yi;
 	double y;
 	float d;
@@ -17,17 +19,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 = frexp(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 frexp(%a)=%a,%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 = ulperr(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 frexp(%a) want %a,%lld got %a,%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++;