X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Ffrexpf.c;h=a406523860e60792d0ecfeffd1841f42e54128d1;hb=1a1bad41337d53922fde2abf8645de006c871965;hp=e4f05c1972f8d690aa0750034360e0ce2f181621;hpb=75aab93ef75299e347be24f57223dc93f2af80a4;p=libc-test

diff --git a/src/math/frexpf.c b/src/math/frexpf.c
index e4f05c1..a406523 100644
--- a/src/math/frexpf.c
+++ b/src/math/frexpf.c
@@ -4,11 +4,13 @@
 
 static struct f_fi t[] = {
 #include "sanity/frexpf.h"
+#include "special/frexpf.h"
 
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	int yi;
 	double y;
 	float d;
@@ -17,9 +19,14 @@ 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 = frexpf(p->x, &yi);
-		e = getexcept();
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
 		if (!checkexcept(e, p->e, p->r)) {
 			printf("%s:%d: bad fp exception: %s frexpf(%a)=%a,%lld, want %s",
 				p->file, p->line, rstr(p->r), p->x, p->y, p->i, estr(p->e));
@@ -27,7 +34,7 @@ int main(void)
 			err++;
 		}
 		d = ulperrf(y, p->y, p->dy);
-		if (!checkulp(d, p->r)) {
+		if (!checkcr(y, p->y, p->r) || (isfinite(p->x) && yi != p->i)) {
 			printf("%s:%d: %s frexpf(%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++;