X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmath%2Ffenv.c;h=91b6378323f07849fcc774a3f78928f8b077aeb6;hb=1a68cdaedf8e9d379dc742f8a9c6198c0cb99dc5;hp=e15f0bc07758388993ad07a07f20a43b3e33dd27;hpb=4b4849e54740efe153632dfb14052d7210cea6c6;p=libc-test

diff --git a/src/math/fenv.c b/src/math/fenv.c
index e15f0bc..91b6378 100644
--- a/src/math/fenv.c
+++ b/src/math/fenv.c
@@ -37,6 +37,7 @@ static struct {
 #ifdef FE_UNDERFLOW
 	F(FE_UNDERFLOW),
 #endif
+	{0, 0}
 };
 
 static void test_except()
@@ -45,7 +46,7 @@ static void test_except()
 	int i,r;
 	fenv_t env;
 
-	for (i=0; i < sizeof te/sizeof*te; i++) {
+	for (i=0; te[i].i; i++) {
 		feclearexcept(FE_ALL_EXCEPT);
 
 		r = feraiseexcept(te[i].i);
@@ -57,10 +58,15 @@ static void test_except()
 				te[i].name, te[i].i, r);
 	}
 
+	r = feraiseexcept(FE_ALL_EXCEPT);
+	if (r != 0)
+		error("feraisexcept(FE_ALL_EXCEPT) failed\n");
 	r = fegetenv(&env);
 	if (r != 0)
 		error("fegetenv(&env) = %d\n", r);
-	i = fetestexcept(FE_ALL_EXCEPT);
+	r = fetestexcept(FE_ALL_EXCEPT);
+	if (r != FE_ALL_EXCEPT)
+		error("fetestexcept failed: got 0x%x, want 0x%x (FE_ALL_ECXEPT)\n", r, FE_ALL_EXCEPT);
 	r = fesetenv(FE_DFL_ENV);
 	if (r != 0)
 		error("fesetenv(FE_DFL_ENV) = %d\n", r);
@@ -71,7 +77,7 @@ static void test_except()
 	if (r != 0)
 		error("fesetenv(&env) = %d\n", r);
 	r = fetestexcept(FE_ALL_EXCEPT);
-	if (r != i)
+	if (r != FE_ALL_EXCEPT)
 		error("fesetenv(&env) did not restore exceptions: 0x%x\n", r);
 }
 
@@ -96,6 +102,8 @@ static void test_round()
 	#pragma STDC FENV_ACCESS ON
 	int i,r;
 	fenv_t env;
+	volatile float two100 = 0x1p100;
+	volatile float x;
 
 	for (i=0; i < sizeof tr/sizeof*tr; i++) {
 		if (tr[i].i < 0)
@@ -115,6 +123,11 @@ static void test_round()
 			error("fegetround() = 0x%x, wanted 0x%x (%s)\n", r, tr[i].i, tr[i].name);
 	}
 
+#ifdef FE_UPWARD
+	r = fesetround(FE_UPWARD);
+	if (r != 0)
+		error("fesetround(FE_UPWARD) failed\n");
+#endif
 	r = fegetenv(&env);
 	if (r != 0)
 		error("fegetenv(&env) = %d\n", r);
@@ -125,12 +138,24 @@ static void test_round()
 	r = fegetround();
 	if (r != FE_TONEAREST)
 		error("fesetenv(FE_DFL_ENV) did not set FE_TONEAREST (0x%x), got 0x%x\n", FE_TONEAREST, r);
+	x = two100 + 1;
+	if (x != two100)
+		error("fesetenv(FE_DFL_ENV) did not set FE_TONEAREST, arithmetics rounds upward\n");
+	x = two100 - 1;
+	if (x != two100)
+		error("fesetenv(FE_DFL_ENV) did not set FE_TONEAREST, arithmetics rounds downward or tozero\n");
 	r = fesetenv(&env);
 	if (r != 0)
 		error("fesetenv(&env) = %d\n", r);
 	r = fegetround();
 	if (r != i)
 		error("fesetenv(&env) did not restore 0x%x, got 0x%x\n", i, r);
+#ifdef FE_UPWARD
+	x = two100 + 1;
+	if (x == two100)
+		error("fesetenv did not restore upward rounding\n");
+#endif
+
 }
 
 /* ieee double precision add operation */
@@ -200,10 +225,42 @@ static void test_round_add(void)
 	}
 }
 
+static void test_bad(void)
+{
+	fexcept_t f;
+	int r;
+
+	r = feclearexcept(FE_ALL_EXCEPT);
+	if (r != 0)
+		error("feclearexcept(FE_ALL_EXCEPT) failed\n");
+	r = fetestexcept(-1);
+	if (r != 0)
+		error("fetestexcept(-1) should return 0 when all exceptions are cleared, got %d\n", r);
+	r = feraiseexcept(1234567|FE_ALL_EXCEPT);
+	if (r != 0)
+		error("feraiseexcept returned non-zero for non-supported exceptions: %d\n", r);
+	r = feclearexcept(1234567|FE_ALL_EXCEPT);
+	if (r != 0)
+		error("feclearexcept returned non-zero for non-supported exceptions: %d\n", r);
+	r = fesetround(1234567);
+	if (r == 0)
+		error("fesetround should fail on invalid rounding mode\n");
+	r = fegetexceptflag(&f, 1234567);
+	if (r != 0)
+		error("fegetexceptflag returned non-zero for non-supported exceptions: %d\n", r);
+	r = fegetexceptflag(&f, 0);
+	if (r != 0)
+		error("fegetexceptflag(0) failed\n");
+	r = fesetexceptflag(&f, 1234567);
+	if (r != 0)
+		error("fesetexceptflag returned non-zero fir non-supported exceptions: %d\n", r);
+}
+
 int main(void)
 {
 	test_except();
 	test_round();
 	test_round_add();
+	test_bad();
 	return test_status;
 }