move interp into run_interp

+ This allows us to skip a potential extra function call

1 files changed, 36 insertions, 17 deletions

diff --git a/src/ejit.c b/src/ejit.c
index 86329de..c202c7a 100644
--- a/src/ejit.c
+++ b/src/ejit.c
@@ -1,3 +1,4 @@
+#include <math.h>
 #include <assert.h>
 #include <sys/mman.h>
 
@@ -96,7 +97,11 @@ void ejit_select_compile_func(struct ejit_func *f, size_t gpr, size_t fpr,
 
 	void **labels;
 	/* just get labels, don't actually run anything yet */
-	ejit_interp(f, 0, NULL, NULL, false, &labels);
+	if (ejit_float_type(f->rtype))
+		ejit_run_interp_f(f, 0, NULL, NULL, false, &labels);
+	else
+		ejit_run_interp(f, 0, NULL, NULL, false, &labels);
+
 	foreach_vec(ii, f->insns) {
 		struct ejit_insn i = *insns_at(&f->insns, ii);
 		void *addr = labels[i.op];
@@ -1251,26 +1256,40 @@ static void destroy_interp_state(struct interp_state state)
 	args_destroy(&state.args);
 }
 
-long ejit_run_interp(struct ejit_func *f, size_t argc,
-                     struct ejit_arg args[argc], struct interp_state *state)
+int64_t ejit_run_interp(struct ejit_func *f, size_t argc,
+                     struct ejit_arg args[argc],
+		     struct interp_state *state,
+		     bool run,
+		     void ***labels_wb)
 {
-	assert(f->gpr && "trying to run a function that hasn't been compiled");
-	assert(f->rtype == EJIT_VOID || ejit_int_type(f->rtype));
-	if (f->arena)
-		return ((ejit_escape_t)f->arena)(argc, args);
+	if (run) {
+		assert(f->gpr && "trying to run a function that hasn't been compiled");
+		assert(f->rtype == EJIT_VOID || ejit_int_type(f->rtype));
+		if (f->arena)
+			return ((ejit_escape_t)f->arena)(argc, args);
+	}
 
-	return ejit_interp(f, argc, args, state, true, NULL).r;
+	int64_t retval = 0; double retval_f = 0.0;
+#include "interp.inc"
+	return retval;
 }
 
 double ejit_run_interp_f(struct ejit_func *f, size_t argc,
-                     struct ejit_arg args[argc], struct interp_state *state)
-{
-	assert(f->gpr && "trying to run a function that hasn't been compiled");
-	assert(f->rtype == EJIT_VOID || ejit_int_type(f->rtype));
-	if (f->arena)
-		return ((ejit_escape_f_t)f->arena)(argc, args);
+                     struct ejit_arg args[argc],
+		     struct interp_state *state,
+		     bool run,
+		     void ***labels_wb)
+{
+	if (run) {
+		assert(f->gpr && "trying to run a function that hasn't been compiled");
+		assert(f->rtype == EJIT_VOID || ejit_int_type(f->rtype));
+		if (f->arena)
+			return ((ejit_escape_f_t)f->arena)(argc, args);
+	}
 
-	return ejit_interp(f, argc, args, state, true, NULL).d;
+	int64_t retval = 0; double retval_f = 0.0;
+#include "interp.inc"
+	return retval_f;
 }
 
 int64_t ejit_run_func(struct ejit_func *f, size_t argc,
@@ -1282,7 +1301,7 @@ int64_t ejit_run_func(struct ejit_func *f, size_t argc,
 		return (int64_t)((ejit_escape_t)f->arena)(argc, args);
 
 	struct interp_state state = create_interp_state();
-	long r = ejit_interp(f, argc, args, &state, true, NULL).r;
+	long r = ejit_run_interp(f, argc, args, &state, true, NULL);
 	destroy_interp_state(state);
 	return r;
 }
@@ -1296,7 +1315,7 @@ double ejit_run_func_f(struct ejit_func *f, size_t argc,
 		return ((ejit_escape_f_t)f->arena)(argc, args);
 
 	struct interp_state state = create_interp_state();
-	double r = ejit_interp(f, argc, args, &state, true, NULL).d;
+	double r = ejit_run_interp_f(f, argc, args, &state, true, NULL);
 	destroy_interp_state(state);
 	return r;
 }