work through loads and stores

1 files changed, 14 insertions, 20 deletions

diff --git a/tests/lshi.c b/tests/lshi.c
index 772c0ed..92550a5 100644
--- a/tests/lshi.c
+++ b/tests/lshi.c
@@ -1,27 +1,21 @@
-#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));
+	struct ejit_operand operands[2] = {
+		EJIT_OPERAND_GPR(0, EJIT_TYPE(long))
+	};
 
-	jit_lshi(j, JIT_R0, JIT_R0, 31);
-	jit_leave_jit_abi(j, 0, 0, align);
-	jit_retr(j, JIT_R0);
+	struct ejit_func *f = ejit_create_func(EJIT_TYPE(long), 1, operands);
 
-	jit_word_t (*f)(jit_word_t) = jit_end(j, NULL);
+	ejit_lshi(f, EJIT_GPR(0), EJIT_GPR(0), 31);
+	ejit_retr(f, EJIT_GPR(0));
 
-#if EJIT_WORDSIZE == 32
-	ASSERT(f(-0x7f) == 0x80000000);
-#else
-	ASSERT(f(-0x7f) == 0xffffffc080000000);
-#endif
-}
+	ejit_select_compile_func(f, 1, 0, false, do_jit);
 
-int
-main (int argc, char *argv[])
-{
-	return main_helper(argc, argv, run_test);
+	assert(erf1(f, EJIT_ARG(-0x7f, long)) == (int64_t)0xffffffc080000000);
+
+	ejit_destroy_func(f);
 }