X-Git-Url: http://nsz.repo.hu/git/?p=libc-test;a=blobdiff_plain;f=src%2Fmath%2Fceill.c;h=45d24a11b61ca784d0d4f714d4aed7638d54e662;hp=56fd82f098ae627ab241cb9e81cad81a22b56635;hb=b55b931794bff9e88a3443daa8404c74f7f1d17c;hpb=f9d17902a35b6403b7c8354845e9f13f882c1c8e

diff --git a/src/math/ceill.c b/src/math/ceill.c
index 56fd82f..45d24a1 100644
--- a/src/math/ceill.c
+++ b/src/math/ceill.c
@@ -1,19 +1,23 @@
 #include <stdint.h>
 #include <stdio.h>
-#include "util.h"
+#include "mtest.h"
 
 static struct l_l t[] = {
 #if LDBL_MANT_DIG == 53
-D
-#include "sanity/ceill.h"
-#elif LDBL_MANT_DIG == 64
+#include "ucb/ceil.h"
+#include "sanity/ceil.h"
+#include "special/ceil.h"
 
+#elif LDBL_MANT_DIG == 64
 #include "sanity/ceill.h"
+#include "special/ceill.h"
+
 #endif
 };
 
 int main(void)
 {
+	#pragma STDC FENV_ACCESS ON
 	long double y;
 	float d;
 	int e, i, err = 0;
@@ -21,18 +25,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 = ceill(p->x);
-		e = getexcept();
-		if (!checkexcept(e, p->e, p->r)) {
-			printf("%s ceill(%La)==%La 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) && (e|INEXACT) != p->e) {
+			printf("%s:%d: bad fp exception: %s ceill(%La)=%La, want %s",
+				p->file, p->line, rstr(p->r), p->x, p->y, estr(p->e));
 			printf(" got %s\n", estr(e));
 			err++;
 		}
 		d = ulperrl(y, p->y, p->dy);
-		if (!checkulp(d, p->r)) {
-			printf("%s ceill(%La) want %La got %La 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 ceill(%La) want %La got %La ulperr %.3f = %a + %a\n",
+				p->file, p->line, rstr(p->r), p->x, p->y, y, d, d-p->dy, p->dy);
 			err++;
 		}
 	}