X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Ffdimf.c;h=56dac2fbab8ade0bf7b7338a3f4180c2f1a0f2f6;hb=125fb69ba64c0064de25eb1a23217b00aa393051;hp=8e1d6d160dcab70433e430e27111636e26a09aac;hpb=4282b03a8c212b0e38af1876364be5f332673ce6;p=libc-test

diff --git a/src/math/fdimf.c b/src/math/fdimf.c
index 8e1d6d1..56dac2f 100644
--- a/src/math/fdimf.c
+++ b/src/math/fdimf.c
@@ -9,6 +9,7 @@ static struct ff_f t[] = {
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	float y;
 	float d;
 	int e, i, err = 0;
@@ -16,18 +17,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 = fdimf(p->x, p->x2);
-		e = getexcept();
+		e = fetestexcept(INEXACT|INVALID|DIVBYZERO|UNDERFLOW|OVERFLOW);
+
 		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s fdimf(%a,%a)==%a except: want %s", rstr(p->r), p->x, p->x2, p->y, estr(p->e));
+			printf("%s:%d: bad fp exception: %s fdimf(%a,%a)=%a, want %s",
+				p->file, p->line, rstr(p->r), p->x, p->x2, 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 fdimf(%a,%a) want %a got %a ulperr %.3f = %a + %a\n",
-				rstr(p->r), p->x, p->x2, p->y, y, d, d-p->dy, p->dy);
+			printf("%s:%d: %s fdimf(%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++;
 		}
 	}