X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftest%2Fao_int64_test.c;h=c26a63b0c1f8d968ba197c1403beaffbcdc4ec4d;hp=67ba6ec542cbeb00a82607f081e7e942f650d414;hb=cb844328322fd7d9f4dafb58b322257a70b347e6;hpb=3114baef45803250a2e5cdd2ee4a9171f2045b0c;ds=sidebyside

diff --git a/src/test/ao_int64_test.c b/src/test/ao_int64_test.c
index 67ba6ec5..c26a63b0 100644
--- a/src/test/ao_int64_test.c
+++ b/src/test/ao_int64_test.c
@@ -22,17 +22,35 @@
 
 int	errors;
 
-#define test(op,func,a,b,ao_a,ao_b) do {				\
+#define test_o(op,func,mod,a,b,ao_a,ao_b) do {				\
 		r = (a) op (b);						\
 		func(&ao_r, ao_a, ao_b);				\
 		c = ao_cast64(&ao_r);					\
 		if (c != r) {						\
-			printf ("trial %4d: %lld " #func " %lld = %lld (should be %lld)\n", \
+			printf ("trial %4d: %lld " #func mod " %lld = %lld (should be %lld)\n", \
 				trial, (int64_t) (a), (int64_t) b, c, r); \
 			++errors;					\
 		}							\
 	} while (0)
 
+#define test(op,func,a,b,ao_a,ao_b) test_o(op,func,"",a,b,ao_a,ao_b)
+
+#define test_a(op,func,a,b,ao_a,ao_b) do {	\
+		ao_r = *ao_a;			\
+		test_o(op,func,"_a",a,b,&ao_r,ao_b);	\
+	} while (0)
+
+#define test_b(op,func,a,b,ao_a,ao_b) do {	\
+		ao_r = *ao_b;			\
+		test_o(op,func,"_b",a,b,ao_a,&ao_r);	\
+	} while (0)
+
+#define test_x(op,func,a,b,ao_a,ao_b) do {	\
+		ao_r = *ao_a;			\
+		test_o(op,func,"_xa",a,a,&ao_r,&ao_r);	\
+		ao_r = *ao_b;			\
+		test_o(op,func,"_xb",b,b,&ao_r,&ao_r);	\
+	} while (0)
 
 void
 do_test(int trial, int64_t a, int64_t b)
@@ -44,10 +62,24 @@ do_test(int trial, int64_t a, int64_t b)
 	ao_int64_init64(&ao_b, b >> 32, b);
 
 	test(+, ao_plus64, a, b, &ao_a, &ao_b);
-	test(*, ao_mul64,(int64_t) (int32_t) a, (int32_t) b, (int32_t) a, (int32_t) b);
+	test_a(+, ao_plus64, a, b, &ao_a, &ao_b);
+	test_b(+, ao_plus64, a, b, &ao_a, &ao_b);
+	test_x(+, ao_plus64, a, b, &ao_a, &ao_b);
+	test(-, ao_minus64, a, b, &ao_a, &ao_b);
+	test_a(-, ao_minus64, a, b, &ao_a, &ao_b);
+	test_b(-, ao_minus64, a, b, &ao_a, &ao_b);
+	test_x(-, ao_minus64, a, b, &ao_a, &ao_b);
+	test(*, ao_mul64_32_32,(int64_t) (int32_t) a, (int32_t) b, (int32_t) a, (int32_t) b);
+	test(*, ao_mul64, a, b, &ao_a, &ao_b);
+	test_a(*, ao_mul64, a, b, &ao_a, &ao_b);
+	test_b(*, ao_mul64, a, b, &ao_a, &ao_b);
+	test_x(*, ao_mul64, a, b, &ao_a, &ao_b);
+	test(*, ao_mul64_64_16, a, (uint16_t) b, &ao_a, (uint16_t) b);
+	test_a(*, ao_mul64_64_16, a, (uint16_t) b, &ao_a, (uint16_t) b);
 	test(>>, ao_rshift64, a, (uint8_t) b & 0x3f, &ao_a, (uint8_t) b & 0x3f);
+	test_a(>>, ao_rshift64, a, (uint8_t) b & 0x3f, &ao_a, (uint8_t) b & 0x3f);
 	test(<<, ao_lshift64, a, (uint8_t) b & 0x3f, &ao_a, (uint8_t) b & 0x3f);
-	test(*, ao_mul64_16, a, (uint16_t) b, &ao_a, (uint16_t) b);
+	test_a(<<, ao_lshift64, a, (uint8_t) b & 0x3f, &ao_a, (uint8_t) b & 0x3f);
 }
 
 #define TESTS	10000000