X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Fscalbnf.c;h=69709a15c026bcdaa08f4053336bf3a12560bb18;hb=HEAD;hp=539126493dd61ccb23d832e33ca219a7c3d2e3f5;hpb=75aab93ef75299e347be24f57223dc93f2af80a4;p=libc-test

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