add flag for using 64 bit values on 32 machines

+ JIT backends needs to still trigger an assertion if we detect that the
  user lied

7 files changed, 28 insertions, 11 deletions

diff --git a/include/ejit/ejit.h b/include/ejit/ejit.h
index e15550d..5152d8d 100644
--- a/include/ejit/ejit.h
+++ b/include/ejit/ejit.h
@@ -166,9 +166,9 @@ struct ejit_func;
 struct ejit_func *ejit_create_func(enum ejit_type rtype, size_t argc,
                                    const struct ejit_operand args[argc]);
 
-void ejit_compile_func(struct ejit_func *f, size_t gpr, size_t fpr);
+void ejit_compile_func(struct ejit_func *f, size_t gpr, size_t fpr, bool use_64);
 void ejit_select_compile_func(struct ejit_func *f, size_t gpr, size_t fpr,
-                              bool try_jit);
+                              bool use_64, bool try_jit);
 
 int64_t ejit_run_func(struct ejit_func *f, size_t argc,
                    struct ejit_arg args[argc]);
@@ -270,6 +270,17 @@ static inline struct ejit_arg ejit_double(double a)
 #define EJIT_AUTO(x) \
 	EJIT_ARG(x, typeof(x))
 
+static inline ejit_use64(struct ejit_arg a)
+{
+	if (a.type == EJIT_INT64 || a.type == EJIT_UINT64)
+		return true;
+
+	return false;
+}
+
+#define EJIT_USE64(t) \
+	ejit_use64(EJIT_ARG(0, t))
+
 typedef long (*ejit_escape_t)(size_t argc, const struct ejit_arg args[argc]);
 typedef double (*ejit_escape_f_t)(size_t argc,
                                   const struct ejit_arg args[argc]);
diff --git a/src/common.h b/src/common.h
index c3442c6..1e21e89 100644
--- a/src/common.h
+++ b/src/common.h
@@ -152,6 +152,6 @@ union interp_ret ejit_interp(struct ejit_func *f, size_t argc,
 int64_t ejit_run_interp(struct ejit_func *f, size_t argc,
                      struct ejit_arg args[argc], struct interp_state *state);
 
-bool ejit_compile(struct ejit_func *f);
+bool ejit_compile(struct ejit_func *f, bool use_64);
 
 #endif /* EJIT_COMMON_H */
diff --git a/src/compile/compile.c b/src/compile/compile.c
index c9a92a2..4ac68d3 100644
--- a/src/compile/compile.c
+++ b/src/compile/compile.c
@@ -522,8 +522,14 @@ static size_t compile_fn_body(struct ejit_func *f, jit_state_t *j, void *arena,
 	return size;
 }
 
-bool ejit_compile(struct ejit_func *f)
+bool ejit_compile(struct ejit_func *f, bool use_64)
 {
+	(void)use_64;
+#if __WORDSIZE == 32
+	/* can't compile 64bit code on 32bit systems, give up early */
+	if (use_64)
+		return false;
+#endif
 	if (!init_jit())
 		return false;
 
diff --git a/src/ejit.c b/src/ejit.c
index f6f4d8e..d0d2b07 100644
--- a/src/ejit.c
+++ b/src/ejit.c
@@ -60,13 +60,13 @@ struct ejit_func *ejit_create_func(enum ejit_type rtype, size_t argc,
 	return f;
 }
 
-void ejit_compile_func(struct ejit_func *f, size_t gpr, size_t fpr)
+void ejit_compile_func(struct ejit_func *f, size_t gpr, size_t fpr, bool use_64)
 {
-	ejit_select_compile_func(f, gpr, fpr, true);
+	ejit_select_compile_func(f, gpr, fpr, use_64, true);
 }
 
 void ejit_select_compile_func(struct ejit_func *f, size_t gpr, size_t fpr,
-                              bool try_jit)
+                              bool use_64, bool try_jit)
 {
 	/* emit a final end instruction in case user didn't do a return */
 	emit_insn_i(f, END, 0, 0, 0);
@@ -75,7 +75,7 @@ void ejit_select_compile_func(struct ejit_func *f, size_t gpr, size_t fpr,
 	f->fpr = fpr;
 
 	/* try to jit compile if possible */
-	if (try_jit && ejit_compile(f))
+	if (try_jit && ejit_compile(f, use_64))
 		return;
 
 	/* otherwise, convert opcodes to address labels */
diff --git a/tests/absr_f.c b/tests/absr_f.c
index 94a0e42..8d69037 100644
--- a/tests/absr_f.c
+++ b/tests/absr_f.c
@@ -10,7 +10,7 @@ int main()
 	struct ejit_func *f = ejit_create_func(EJIT_TYPE(double), 1, operands);
 	ejit_absr_f(f, EJIT_FPR(0), EJIT_FPR(0));
 	ejit_retr_f(f, EJIT_FPR(0));
-	ejit_select_compile_func(f, 0, 1, do_jit);
+	ejit_select_compile_func(f, 0, 1, false, do_jit);
 
 	assert(ejit_run_func_f_1(f, EJIT_ARG(0.0, double)) == 0.0);
 	assert(ejit_run_func_f_1(f, EJIT_ARG(-0.0, double)) == 0.0);
diff --git a/tests/addi.c b/tests/addi.c
index e0471d6..c3c84ce 100644
--- a/tests/addi.c
+++ b/tests/addi.c
@@ -10,7 +10,7 @@ int main()
 	struct ejit_func *f = ejit_create_func(EJIT_TYPE(int), 1, operands);
 	ejit_addi(f, EJIT_GPR(0), EJIT_GPR(0), 69);
 	ejit_retr(f, EJIT_GPR(0));
-	ejit_select_compile_func(f, 1, 0, do_jit);
+	ejit_select_compile_func(f, 1, 0, EJIT_USE64(int), do_jit);
 
 	assert(ejit_run_func_1(f, EJIT_ARG(42, int)) == 111);
 	ejit_destroy_func(f);
diff --git a/tests/addr.c b/tests/addr.c
index 099536a..472030f 100644
--- a/tests/addr.c
+++ b/tests/addr.c
@@ -15,7 +15,7 @@ main (int argc, char *argv[])
 	ejit_addr(f, EJIT_GPR(0), EJIT_GPR(0), EJIT_GPR(1));
 	ejit_retr(f, EJIT_GPR(0));
 
-	ejit_select_compile_func(f, 2, 0, do_jit);
+	ejit_select_compile_func(f, 2, 0, EJIT_USE64(long), do_jit);
 
 	assert(ejit_run_func_2(f, EJIT_ARG(42, long), EJIT_ARG(69, long)) == 111);
 	ejit_destroy_func(f);