continue working through test cases

+ Remove overflow and more complicated floating point tests for now

1 files changed, 69 insertions, 13 deletions

diff --git a/include/ejit/ejit.h b/include/ejit/ejit.h
index a910366..03137ab 100644
--- a/include/ejit/ejit.h
+++ b/include/ejit/ejit.h
@@ -226,19 +226,20 @@ void ejit_destroy_func(struct ejit_func *s);
 				.r = (double)(x),         \
 				.type = (t)})
 
+/* maybe slight hack, but increase width to interpeter register width */
 static inline struct ejit_arg ejit_i8(int8_t a)
 {
-	return (struct ejit_arg){.i8 = a, .type = EJIT_INT8};
+	return (struct ejit_arg){.i64 = a, .type = EJIT_INT8};
 }
 
 static inline struct ejit_arg ejit_i16(int16_t a)
 {
-	return (struct ejit_arg){.i16 = a, .type = EJIT_INT16};
+	return (struct ejit_arg){.i64 = a, .type = EJIT_INT16};
 }
 
 static inline struct ejit_arg ejit_i32(int32_t a)
 {
-	return (struct ejit_arg){.i32 = a, .type = EJIT_INT32};
+	return (struct ejit_arg){.i64 = a, .type = EJIT_INT32};
 }
 
 static inline struct ejit_arg ejit_i64(int64_t a)
@@ -253,7 +254,7 @@ static inline struct ejit_arg ejit_pointer(void *p)
 
 static inline struct ejit_arg ejit_float(float a)
 {
-	return (struct ejit_arg){.f = a, .type = EJIT_FLOAT};
+	return (struct ejit_arg){.d = a, .type = EJIT_FLOAT};
 }
 
 static inline struct ejit_arg ejit_double(double a)
@@ -335,17 +336,17 @@ void ejit_ldi_f(struct ejit_func *s, struct ejit_fpr r0, void *p);
 void ejit_ldi_d(struct ejit_func *s, struct ejit_fpr r0, void *p);
 
 /* from r1 + o to r0 */
-void ejit_ldxi_8(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
-                 int64_t o);
-
-void ejit_ldxi_16(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
+void ejit_ldxi_i8(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
                   int64_t o);
 
-void ejit_ldxi_32(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
-                  int64_t o);
+void ejit_ldxi_i16(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
+                   int64_t o);
 
-void ejit_ldxi_64(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
-                  int64_t o);
+void ejit_ldxi_i32(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
+                   int64_t o);
+
+void ejit_ldxi_i64(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
+                   int64_t o);
 
 void ejit_ldxi_u8(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
                   int64_t o);
@@ -365,6 +366,30 @@ void ejit_ldxi_f(struct ejit_func *s, struct ejit_fpr r0, struct ejit_gpr r1,
 void ejit_ldxi_d(struct ejit_func *s, struct ejit_fpr r0, struct ejit_gpr r1,
                  int64_t o);
 
+static inline void ejit_ldxi_ptr(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1, int64_t o)
+{
+	if (sizeof(void *) == sizeof(int64_t))
+		ejit_ldxi_u64(s, r0, r1, o);
+	else if (sizeof(void *) == sizeof(int32_t))
+		ejit_ldxi_u32(s, r0, r1, o);
+	else
+		abort();
+}
+
+#define EJIT_LDXI(f, t, r0, r1, o)       \
+	_Generic((t)(0),                 \
+		 int8_t: ejit_ldxi_i8,    \
+		 uint8_t: ejit_ldxi_u8,   \
+		 int16_t: ejit_ldxi_i16,  \
+		 uint16_t: ejit_ldxi_u16, \
+		 int32_t: ejit_ldxi_i32,  \
+		 uint32_t: ejit_ldxi_u32, \
+		 int64_t: ejit_ldxi_i64,  \
+		 uint64_t: ejit_ldxi_u64, \
+		 float: ejit_ldxi_f,     \
+		 double: ejit_ldxi_d,    \
+		 default: ejit_ldxi_ptr)((f), (r0), (r1), (o))
+
 void ejit_sti_8(struct ejit_func *s, struct ejit_gpr r0, void *p);
 void ejit_sti_16(struct ejit_func *s, struct ejit_gpr r0, void *p);
 void ejit_sti_32(struct ejit_func *s, struct ejit_gpr r0, void *p);
@@ -397,6 +422,31 @@ void ejit_stxi_f(struct ejit_func *s, struct ejit_fpr r0, struct ejit_gpr r1,
 void ejit_stxi_d(struct ejit_func *s, struct ejit_fpr r0, struct ejit_gpr r1,
                  int64_t o);
 
+static inline void ejit_stxi_ptr(struct ejit_func *s, struct ejit_gpr r0,
+                                 struct ejit_gpr r1, int64_t o)
+{
+	if (sizeof(void *) == sizeof(int64_t))
+		ejit_stxi_64(s, r0, r1, o);
+	else if (sizeof(void *) == sizeof(int32_t))
+		ejit_stxi_32(s, r0, r1, o);
+	else
+		abort();
+}
+
+#define EJIT_STXI(f, t, r0, r1, o)       \
+	_Generic((t)(0),                 \
+		 int8_t: ejit_stxi_8,    \
+		 uint8_t: ejit_stxi_8,   \
+		 int16_t: ejit_stxi_16,  \
+		 uint16_t: ejit_stxi_16, \
+		 int32_t: ejit_stxi_32,  \
+		 uint32_t: ejit_stxi_32, \
+		 int64_t: ejit_stxi_64,  \
+		 uint64_t: ejit_stxi_64, \
+		 float: ejit_stxi_f,     \
+		 double: ejit_stxi_d,    \
+		 default: ejit_stxi_ptr)((f), (r0), (r1), (o))
+
 void ejit_addr(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
                struct ejit_gpr r2);
 
@@ -424,6 +474,8 @@ void ejit_mulr_f(struct ejit_func *s, struct ejit_fpr r0, struct ejit_fpr r1,
 
 void ejit_divr(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
                struct ejit_gpr r2);
+void ejit_divr_u(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
+                 struct ejit_gpr r2);
 void ejit_divr_f(struct ejit_func *s, struct ejit_fpr r0, struct ejit_fpr r1,
                  struct ejit_fpr r2);
 
@@ -432,10 +484,14 @@ void ejit_andr(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
 void ejit_andi(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
                int64_t o);
 
+void ejit_comr(struct ejit_func *f, struct ejit_gpr r0, struct ejit_gpr r1);
 void ejit_negr(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1);
 
 void ejit_eqr(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
               struct ejit_gpr r2);
+void ejit_eqr_f(struct ejit_func *s, struct ejit_gpr r0, struct ejit_fpr r1,
+		struct ejit_fpr r2);
+
 void ejit_ltr(struct ejit_func *s, struct ejit_gpr r0, struct ejit_gpr r1,
               struct ejit_gpr r2);
 
@@ -445,7 +501,7 @@ struct ejit_reloc ejit_bner(struct ejit_func *s, struct ejit_gpr r0,
                             struct ejit_gpr r1);
 struct ejit_reloc ejit_bnei(struct ejit_func *s, struct ejit_gpr r0, int64_t o);
 struct ejit_reloc ejit_bner_f(struct ejit_func *s, struct ejit_fpr r0,
-                            struct ejit_fpr r1);
+                              struct ejit_fpr r1);
 
 struct ejit_reloc ejit_beqr(struct ejit_func *s, struct ejit_gpr r0,
                             struct ejit_gpr r1);