continue working through test cases

+ Remove overflow and more complicated floating point tests for now

1 files changed, 57 insertions, 37 deletions

diff --git a/tests/comr.c b/tests/comr.c
index 3cfacac..a6b6dc3 100644
--- a/tests/comr.c
+++ b/tests/comr.c
@@ -1,41 +1,61 @@
-#include "test.h"
+#include <ejit/ejit.h>
+#include <assert.h>
+#include "do_jit.h"
 
-static void
-run_test(jit_state_t *j, uint8_t *arena_base, size_t arena_size)
+int main()
 {
-	jit_begin(j, arena_base, arena_size);
-	size_t align = jit_enter_jit_abi(j, 0, 0, 0);
-	jit_load_args_1(j, jit_operand_gpr (JIT_OPERAND_ABI_WORD, JIT_R0));
-
-	jit_comr(j, JIT_R0, JIT_R0);
-	jit_leave_jit_abi(j, 0, 0, align);
-	jit_retr(j, JIT_R0);
-
-	jit_word_t (*f)(jit_word_t) = jit_end(j, NULL);
-
-#if EJIT_WORDSIZE == 32
-	ASSERT(f(0) == 0xffffffff);
-	ASSERT(f(1) == 0xfffffffe);
-	ASSERT(f(0xffffffff) == 0);
-	ASSERT(f(0x80000000) == 0x7fffffff);
-	ASSERT(f(0x7fffffff) == 0x80000000);
-	ASSERT(f(0x80000001) == 0x7ffffffe);
-#else
-	ASSERT(f(0) == 0xffffffffffffffff);
-	ASSERT(f(1) == 0xfffffffffffffffe);
-	ASSERT(f(0xffffffff) == 0xffffffff00000000);
-	ASSERT(f(0x80000000) == 0xffffffff7fffffff);
-	ASSERT(f(0x7fffffff) == 0xffffffff80000000);
-	ASSERT(f(0x80000001) == 0xffffffff7ffffffe);
-	ASSERT(f(0xffffffffffffffff) == 0);
-	ASSERT(f(0x8000000000000000) == 0x7fffffffffffffff);
-	ASSERT(f(0x7fffffffffffffff) == 0x8000000000000000);
-	ASSERT(f(0x8000000000000001) == 0x7ffffffffffffffe);
-#endif
-}
+	struct ejit_operand operands[1] = {
+		EJIT_OPERAND_GPR(0, EJIT_TYPE(long))
+	};
 
-int
-main (int argc, char *argv[])
-{
-	return main_helper(argc, argv, run_test);
+	struct ejit_func *f = ejit_create_func(EJIT_TYPE(long), 1, operands);
+
+	ejit_comr(f, EJIT_GPR(0), EJIT_GPR(0));
+	ejit_retr(f, EJIT_GPR(0));
+
+	ejit_select_compile_func(f, 1, 0, EJIT_USE64(long), do_jit);
+
+	assert((int32_t)ejit_run_func_1(f, EJIT_ARG(0, long))
+	       == (int32_t)0xffffffff);
+
+	assert((int32_t)ejit_run_func_1(f, EJIT_ARG(1, long))
+	       == (int32_t)0xfffffffe);
+
+	assert((int32_t)ejit_run_func_1(f, EJIT_ARG(0xffffffff, long)) == 0);
+	assert((int32_t)ejit_run_func_1(f, EJIT_ARG(0x80000000, long))
+	       == 0x7fffffff);
+
+	assert((int32_t)ejit_run_func_1(f, EJIT_ARG(0x7fffffff, long))
+	       == (int32_t)0x80000000);
+
+	assert((int32_t)ejit_run_func_1(f, EJIT_ARG(0x80000001, long))
+	       == (int32_t)0x7ffffffe);
+
+	assert(ejit_run_func_1(f, EJIT_ARG(0, long))
+	       == (int64_t)0xffffffffffffffff);
+
+	assert(ejit_run_func_1(f, EJIT_ARG(1, long))
+	       == (int64_t)0xfffffffffffffffe);
+
+	assert(ejit_run_func_1(f, EJIT_ARG(0xffffffff, long))
+	       == (int64_t)0xffffffff00000000);
+
+	assert(ejit_run_func_1(f, EJIT_ARG(0x80000000, long))
+	       == (int64_t)0xffffffff7fffffff);
+
+	assert(ejit_run_func_1(f, EJIT_ARG(0x7fffffff, long))
+	       == (int64_t)0xffffffff80000000);
+
+	assert(ejit_run_func_1(f, EJIT_ARG(0x80000001, long))
+	       == (int64_t)0xffffffff7ffffffe);
+
+	assert(ejit_run_func_1(f, EJIT_ARG(0xffffffffffffffff, long)) == 0);
+	assert(ejit_run_func_1(f, EJIT_ARG(0x8000000000000000, long))
+	       == (int64_t)0x7fffffffffffffff);
+
+	assert(ejit_run_func_1(f, EJIT_ARG(0x7fffffffffffffff, long))
+	       == (int64_t)0x8000000000000000);
+
+	assert(ejit_run_func_1(f, EJIT_ARG(0x8000000000000001, long))
+	       == (int64_t)0x7ffffffffffffffe);
 }