start supporting 32bit arches

2 files changed, 18 insertions, 22 deletions

diff --git a/examples/fib.c b/examples/fib.c
index fe2b215..308ecd1 100644
--- a/examples/fib.c
+++ b/examples/fib.c
@@ -3,12 +3,12 @@
 
 #include "../include/ejit/ejit.h"
 
-struct ejit_func *compile()
+struct ejit_func *compile(bool try_jit)
 {
 	struct ejit_operand args[1] = {
-		EJIT_OPERAND_GPR(0, EJIT_INT64) /* loc 0 contains n */
+		EJIT_OPERAND_GPR(0, EJIT_INT32) /* loc 0 contains n */
 	};
-	struct ejit_func *f = ejit_create_func(EJIT_INT64, 1, args);
+	struct ejit_func *f = ejit_create_func(EJIT_INT32, 1, args);
 	struct ejit_reloc recurse = ejit_bgti(f, EJIT_GPR(0), 2); /* n <= 2 */
 	ejit_reti(f, 1);
 
@@ -18,63 +18,59 @@ struct ejit_func *compile()
 	/* fib(n - 1) */
 	ejit_subi(f, EJIT_GPR(0), EJIT_GPR(0), 1);
 	struct ejit_operand arg[1] = {
-		EJIT_OPERAND_GPR(0, EJIT_INT64)
+		EJIT_OPERAND_GPR(0, EJIT_INT32)
 	};
-	ejit_calli(f, f, 1, arg);
+	ejit_calli_i(f, f, 1, arg);
 	ejit_retval(f, EJIT_GPR(1)); /* loc 1 contains temp result */
 
 	/* fib(n - 2) */
 	ejit_subi(f, EJIT_GPR(0), EJIT_GPR(0), 1);
-	ejit_calli(f, f, 1, arg);
+	ejit_calli_i(f, f, 1, arg);
 	ejit_retval(f, EJIT_GPR(0)); /* loc 0 now contains second temp result */
 
 	ejit_addr(f, EJIT_GPR(0), EJIT_GPR(0), EJIT_GPR(1)); /* add results */
 	ejit_retr(f, EJIT_GPR(0));
 
-	bool try_jit = true;
-#ifdef NOJIT
-	try_jit = false;
-#endif
-
 	/* the highest location we used was 1, so we need to request 2 locations
 	 * for general purpose registers in total. No floating point registers,
 	 * so 0. */
-	ejit_select_compile_func(f, 2, 0, true, try_jit);
+	ejit_select_compile_func(f, 2, 0, EJIT_USE64(int32_t), try_jit);
 	return f;
 }
 
 int main(int argc, char *argv[])
 {
-	if(argc != 3){
-		fprintf(stderr, "Usage: %s compile_num loop_num\n", argv[0]);
+	if(argc != 4){
+		fprintf(stderr, "Usage: %s compile_num loop_num jit\n", argv[0]);
 		return -1;
 	}
 
+	int try_jit = strtoull(argv[3], 0, 0);
 	size_t compile_num = strtoull(argv[1], 0, 0);
 	struct ejit_func **info = calloc(compile_num, sizeof(struct ejit_func *));
 
 	clock_t t = clock();
 	for(size_t i = 0; i < compile_num; ++i){
-		info[i] = compile();
+		info[i] = compile(try_jit);
 	}
 	t = clock() - t;
 
 	double compile_time_total = ((double)t) / CLOCKS_PER_SEC;
 	double compile_time_one = compile_time_total / compile_num;
-	printf("Compilation for n = %lu took %fs (1/%f).\n",
+	printf("Compilation for n = %zu took %fs (1/%f).\n",
 			compile_num, compile_time_total, compile_time_one);
 
 	size_t run_num = strtoull(argv[2], 0, 0);
 	t = clock();
 	struct ejit_arg arg[1] = {
-		(struct ejit_arg){.type = EJIT_INT64, .l = run_num}
+		(struct ejit_arg){.type = EJIT_INT32, .l = run_num}
 	};
-	size_t result = ejit_run_func(info[0], 1, arg);
+	int32_t result = ejit_run_func_i(info[0], 1, arg);
 	t = clock() - t;
 
 	double run_time_total = ((double)t) / CLOCKS_PER_SEC;
-	printf("Running loop for n = %lu took %fs with res %lu\n",
-			run_num, run_time_total, result);
+	printf("Running loop for n = %zu took %fs with res %ld\n",
+			run_num, run_time_total, (long)result);
 
 	for(size_t i = 0; i < compile_num; ++i)
 		ejit_destroy_func(info[i]);
diff --git a/examples/loop.c b/examples/loop.c
index 51ba2e9..537a931 100644
--- a/examples/loop.c
+++ b/examples/loop.c
@@ -3,7 +3,7 @@
 
 int main()
 {
-	struct ejit_func *f = ejit_create_func(EJIT_INT64, 0, NULL);
+	struct ejit_func *f = ejit_create_func(EJIT_TYPE(long), 0, NULL);
 
 	ejit_movi(f, EJIT_GPR(3), 1); // location 3 just has a constant 1 for
 				      // increment
@@ -21,7 +21,7 @@ int main()
 	ejit_patch(f, r, l);
 
 	ejit_compile_func(f);
-	long result = ejit_run_func(f, 0, NULL); // no args so this is fine
+	long result = ejit_run_func_i(f, 0, NULL); // no args so this is fine
 	printf("%ld\n", result);
 
 	ejit_destroy_func(f);