make code a bit more robust

+ Should be more difficult to make mistakes in the future, ejit can now
  automatically keep track of how many register slots are used and if 64
  bit mode is required. Slight runtime overhead, but not too bad.

8 files changed, 8 insertions, 8 deletions

diff --git a/tests/andr64.c b/tests/andr64.c
index 6d7f09e..3d56e39 100644
--- a/tests/andr64.c
+++ b/tests/andr64.c
@@ -16,7 +16,7 @@ int main(int argc, char *argv[])
 	ejit_andr(f, EJIT_GPR(0), EJIT_GPR(0), EJIT_GPR(1));
 	ejit_retr(f, EJIT_GPR(0));
 
-	ejit_select_compile_func(f, 1, 0, EJIT_USE64(int64_t), do_jit);
+	ejit_select_compile_func(f, 2, 0, EJIT_USE64(int64_t), do_jit);
 
 	assert(erf2(f, EJIT_ARG(1, int64_t),
 	            EJIT_ARG(0x7fffffff, int64_t)) == 1);
diff --git a/tests/ldi_d.c b/tests/ldi_d.c
index 15a48b4..949eaee 100644
--- a/tests/ldi_d.c
+++ b/tests/ldi_d.c
@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
 	ejit_ldi_d(f, EJIT_FPR(0), &data);
 	ejit_retr_d(f, EJIT_FPR(0));
 
-	ejit_select_compile_func(f, 1, 0, EJIT_USE64(double), do_jit);
+	ejit_select_compile_func(f, 0, 1, EJIT_USE64(double), do_jit);
 
 	assert(ejit_run_func_f(f, 0, NULL) == data);
 
diff --git a/tests/ldi_f.c b/tests/ldi_f.c
index 76a4f34..d070387 100644
--- a/tests/ldi_f.c
+++ b/tests/ldi_f.c
@@ -12,7 +12,7 @@ int main(int argc, char *argv[])
 	ejit_ldi_f(f, EJIT_FPR(0), &data);
 	ejit_retr_f(f, EJIT_FPR(0));
 
-	ejit_select_compile_func(f, 1, 0, EJIT_USE64(float), do_jit);
+	ejit_select_compile_func(f, 0, 1, EJIT_USE64(float), do_jit);
 
 	assert(ejit_run_func_f(f, 0, NULL) == data);
 
diff --git a/tests/stxi_16.c b/tests/stxi_16.c
index 9b8ec52..9f98137 100644
--- a/tests/stxi_16.c
+++ b/tests/stxi_16.c
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
 	ejit_stxi_16(f, EJIT_GPR(1), EJIT_GPR(0), (uintptr_t)data);
 	ejit_ret(f);
 
-	ejit_select_compile_func(f, 2, 0, EJIT_USE64(int), do_jit);
+	ejit_select_compile_func(f, 2, 0, EJIT_USE64(int) | EJIT_USE64(uintptr_t), do_jit);
 
 	assert(data[0] == 0x1212);
 	assert(data[1] == 0);
diff --git a/tests/stxi_32.c b/tests/stxi_32.c
index d64c22b..3f3b8f4 100644
--- a/tests/stxi_32.c
+++ b/tests/stxi_32.c
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
 	ejit_stxi_32(f, EJIT_GPR(1), EJIT_GPR(0), (uintptr_t)data);
 	ejit_ret(f);
 
-	ejit_select_compile_func(f, 2, 0, EJIT_USE64(int32_t), do_jit);
+	ejit_select_compile_func(f, 2, 0, EJIT_USE64(int32_t) | EJIT_USE64(uintptr_t), do_jit);
 
 	assert(data[0] == 0x12121212);
 	assert(data[1] == 0x00);
diff --git a/tests/stxi_8.c b/tests/stxi_8.c
index db2aa5a..59ec4c7 100644
--- a/tests/stxi_8.c
+++ b/tests/stxi_8.c
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
 	ejit_stxi_8(f, EJIT_GPR(1), EJIT_GPR(0), (uintptr_t)data);
 	ejit_ret(f);
 
-	ejit_select_compile_func(f, 2, 0, EJIT_USE64(int), do_jit);
+	ejit_select_compile_func(f, 2, 0, EJIT_USE64(int) | EJIT_USE64(uintptr_t), do_jit);
 
 	assert(data[0] == 0x12);
 	assert(data[1] == 0x00);
diff --git a/tests/stxi_d.c b/tests/stxi_d.c
index c2b9df7..128dbb7 100644
--- a/tests/stxi_d.c
+++ b/tests/stxi_d.c
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
 	ejit_stxi_d(f, EJIT_FPR(0), EJIT_GPR(0), (uintptr_t)data);
 	ejit_ret(f);
 
-	ejit_select_compile_func(f, 1, 1, EJIT_USE64(double), do_jit);
+	ejit_select_compile_func(f, 1, 1, EJIT_USE64(double) | EJIT_USE64(uintptr_t), do_jit);
 
 	assert(data[0] == -1.0f);
 	assert(data[1] == 0.0f);
diff --git a/tests/stxi_f.c b/tests/stxi_f.c
index baac4b4..4c218ed 100644
--- a/tests/stxi_f.c
+++ b/tests/stxi_f.c
@@ -17,7 +17,7 @@ int main(int argc, char *argv[])
 	ejit_stxi_f(f, EJIT_FPR(0), EJIT_GPR(0), (uintptr_t)data);
 	ejit_ret(f);
 
-	ejit_select_compile_func(f, 1, 1, EJIT_USE64(float), do_jit);
+	ejit_select_compile_func(f, 1, 1, EJIT_USE64(float) | EJIT_USE64(uintptr_t), do_jit);
 
 	assert(data[0] == -1.0);
 	assert(data[1] == 0.0);