X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Fhypotl.c;h=cae06ddd4e15c7ce2f251111dbe18630eb1a4822;hb=281b80f0e70fe28356c3f0ded8b86f28a5c74d0a;hp=d84c6c83f030471e490fcbbb6f896100dececc1e;hpb=457b0dbfc1d72080f6ba9fe47cd712e0f090732a;p=libc-test

diff --git a/src/math/hypotl.c b/src/math/hypotl.c
index d84c6c8..cae06dd 100644
--- a/src/math/hypotl.c
+++ b/src/math/hypotl.c
@@ -1,20 +1,23 @@
 #include <stdint.h>
 #include <stdio.h>
-#include "util.h"
+#include "mtest.h"
 
 static struct ll_l t[] = {
 #if LDBL_MANT_DIG == 53
 #include "ucb/hypot.h"
 #include "sanity/hypot.h"
+#include "special/hypot.h"
 
 #elif LDBL_MANT_DIG == 64
 #include "sanity/hypotl.h"
+#include "special/hypotl.h"
 
 #endif
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	long double y;
 	float d;
 	int e, i, err = 0;
@@ -22,9 +25,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 = hypotl(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 hypotl(%La,%La)=%La, want %s",
 				p->file, p->line, rstr(p->r), p->x, p->x2, p->y, estr(p->e));
@@ -32,7 +40,7 @@ int main(void)
 			err++;
 		}
 		d = ulperrl(y, p->y, p->dy);
-		if (!checkulp(d, p->r)) {
+		if (!checkulp(d, p->r) || (p->r == RN && fabs(d) >= 1.0)) {
 			printf("%s:%d: %s hypotl(%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++;