X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Ffmaxl.c;h=1c6e42a871b4ada51fd036e9f4a4e3947a9d8017;hb=cfa23cc1bd01f5c44d7746b8b1839f84d5e1b6eb;hp=e074e1324955e9f2ccf617eed2a9f96bd8fb7222;hpb=457b0dbfc1d72080f6ba9fe47cd712e0f090732a;p=libc-test

diff --git a/src/math/fmaxl.c b/src/math/fmaxl.c
index e074e13..1c6e42a 100644
--- a/src/math/fmaxl.c
+++ b/src/math/fmaxl.c
@@ -1,19 +1,22 @@
 #include <stdint.h>
 #include <stdio.h>
-#include "util.h"
+#include "mtest.h"
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
 #include "sanity/fmax.h"
+#include "special/fmax.h"
 
 #elif LDBL_MANT_DIG == 64
 #include "sanity/fmaxl.h"
+#include "special/fmaxl.h"
 
 #endif
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	long double y;
 	float d;
 	int e, i, err = 0;
@@ -21,9 +24,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 = fmaxl(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 fmaxl(%La,%La)=%La, want %s",
 				p->file, p->line, rstr(p->r), p->x, p->x2, p->y, estr(p->e));
@@ -31,7 +39,7 @@ int main(void)
 			err++;
 		}
 		d = ulperrl(y, p->y, p->dy);
-		if (!checkulp(d, p->r)) {
+		if (!checkcr(y, p->y, p->r)) {
 			printf("%s:%d: %s fmaxl(%La,%La) want %La got %La 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++;