X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Ffmax.c;h=5479ad91cd95edebfcb9237c9ea2f6cd436b974d;hb=b3580f11bf7b91afd597e6224c2f265d6d0b087f;hp=938361ce3cc550cc7823e215540ab628e4b4248f;hpb=457b0dbfc1d72080f6ba9fe47cd712e0f090732a;p=libc-test

diff --git a/src/math/fmax.c b/src/math/fmax.c
index 938361c..5479ad9 100644
--- a/src/math/fmax.c
+++ b/src/math/fmax.c
@@ -4,11 +4,13 @@
 
 static struct dd_d t[] = {
 #include "sanity/fmax.h"
+#include "special/fmax.h"
 
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	double y;
 	float d;
 	int e, i, err = 0;
@@ -16,9 +18,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 = fmax(p->x, p->x2);
-		e = getexcept();
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
 		if (!checkexcept(e, p->e, p->r)) {
 			printf("%s:%d: bad fp exception: %s fmax(%a,%a)=%a, want %s",
 				p->file, p->line, rstr(p->r), p->x, p->x2, p->y, estr(p->e));
@@ -26,7 +33,7 @@ int main(void)
 			err++;
 		}
 		d = ulperr(y, p->y, p->dy);
-		if (!checkulp(d, p->r)) {
+		if (!checkcr(y, p->y, p->r)) {
 			printf("%s:%d: %s fmax(%a,%a) want %a got %a ulperr %.3f = %a + %a\n",
 				p->file, p->line, rstr(p->r), p->x, p->x2, p->y, y, d, d-p->dy, p->dy);
 			err++;