X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Fsqrtf.c;h=8e8f8fe20ec8243d19bc4e977c4844ef7958b038;hb=cda5e0484c98223a552580e79af378a6e6e83305;hp=64b80f2de0ce84ddee3cd9f58292a12195d2e1ce;hpb=f9d17902a35b6403b7c8354845e9f13f882c1c8e;p=libc-test

diff --git a/src/math/sqrtf.c b/src/math/sqrtf.c
index 64b80f2..8e8f8fe 100644
--- a/src/math/sqrtf.c
+++ b/src/math/sqrtf.c
@@ -1,15 +1,17 @@
 #include <stdint.h>
 #include <stdio.h>
-#include "util.h"
+#include "mtest.h"
 
 static struct f_f t[] = {
-
 #include "ucb/sqrtf.h"
 #include "sanity/sqrtf.h"
+#include "special/sqrtf.h"
+
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	float y;
 	float d;
 	int e, i, err = 0;
@@ -17,18 +19,24 @@ 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 = sqrtf(p->x);
-		e = getexcept();
-		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s sqrtf(%a)==%a except: want %s", rstr(p->r), p->x, p->y, estr(p->e));
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
+		if (!checkexceptall(e, p->e, p->r)) {
+			printf("%s:%d: bad fp exception: %s sqrtf(%a)=%a, want %s",
+				p->file, p->line, rstr(p->r), p->x, p->y, estr(p->e));
 			printf(" got %s\n", estr(e));
 			err++;
 		}
 		d = ulperrf(y, p->y, p->dy);
-		if (!checkulp(d, p->r)) {
-			printf("%s sqrtf(%a) want %a got %a ulperr %.3f = %a + %a\n",
-				rstr(p->r), p->x, p->y, y, d, d-p->dy, p->dy);
+		if (!checkcr(y, p->y, p->r)) {
+			printf("%s:%d: %s sqrtf(%a) want %a got %a ulperr %.3f = %a + %a\n",
+				p->file, p->line, rstr(p->r), p->x, p->y, y, d, d-p->dy, p->dy);
 			err++;
 		}
 	}