clear up some semantics

1 files changed, 49 insertions, 4 deletions

diff --git a/include/ejit/ejit.h b/include/ejit/ejit.h
index 895ce9b..e15550d 100644
--- a/include/ejit/ejit.h
+++ b/include/ejit/ejit.h
@@ -25,6 +25,21 @@ enum ejit_type
 	EJIT_DOUBLE,
 };
 
+/* can be kind of dangerous since we default to a pointer, hmm */
+#define EJIT_TYPE(x)\
+	_Generic((typeof(x))(0),\
+			int8_t: EJIT_INT8,\
+			int16_t: EJIT_INT16,\
+			int32_t: EJIT_INT32,\
+			int64_t: EJIT_INT64,\
+			uint8_t: EJIT_UINT8,\
+			uint16_t: EJIT_UINT16,\
+			uint32_t: EJIT_UINT32,\
+			uint64_t: EJIT_UINT64,\
+			float: EJIT_FLOAT,\
+			double: EJIT_DOUBLE,\
+			default: EJIT_POINTER)
+
 struct ejit_arg {
 	union {
 		int8_t i8;
@@ -155,8 +170,20 @@ void ejit_compile_func(struct ejit_func *f, size_t gpr, size_t fpr);
 void ejit_select_compile_func(struct ejit_func *f, size_t gpr, size_t fpr,
                               bool try_jit);
 
-long ejit_run_func(struct ejit_func *f, size_t argc,
+int64_t ejit_run_func(struct ejit_func *f, size_t argc,
                    struct ejit_arg args[argc]);
+
+static inline int64_t ejit_run_func_1(struct ejit_func *f, struct ejit_arg a0)
+{
+	return ejit_run_func(f, 1, &a0);
+}
+
+static inline int64_t ejit_run_func_2(struct ejit_func *f, struct ejit_arg a0, struct ejit_arg a1)
+{
+	struct ejit_arg args[2] = {a0, a1};
+	return ejit_run_func(f, 2, args);
+}
+
 double ejit_run_func_f(struct ejit_func *f, size_t argc,
                        struct ejit_arg args[argc]);
 
@@ -205,13 +232,28 @@ static inline struct ejit_arg ejit_i32(int32_t a)
 	return (struct ejit_arg){.i32 = a, .type = EJIT_INT32};
 }
 
+static inline struct ejit_arg ejit_i64(int64_t a)
+{
+	return (struct ejit_arg){.i64 = a, .type = EJIT_INT64};
+}
+
+static inline struct ejit_arg ejit_pointer(void *p)
+{
+	return (struct ejit_arg){.p = p, .type = EJIT_POINTER};
+}
+
+static inline struct ejit_arg ejit_float(float a)
+{
+	return (struct ejit_arg){.f = a, .type = EJIT_FLOAT};
+}
+
 static inline struct ejit_arg ejit_double(double a)
 {
 	return (struct ejit_arg){.d = a, .type = EJIT_DOUBLE};
 }
 
-#define EJIT_ARG(x)                     \
-	_Generic((x),                   \
+#define EJIT_ARG(x, t)                  \
+	_Generic((t)(0),                   \
 		 int8_t: ejit_i8,       \
 		 int16_t: ejit_i16,     \
 		 int32_t: ejit_i32,     \
@@ -222,9 +264,12 @@ static inline struct ejit_arg ejit_double(double a)
 		 uint64_t: ejit_i64,    \
 		 float: ejit_float,     \
 		 double: ejit_double,   \
-		 default: ejit_pointer, \
+		 default: ejit_pointer \
 		 )(x)
 
+#define EJIT_AUTO(x) \
+	EJIT_ARG(x, typeof(x))
+
 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]);