1 files changed, 28 insertions, 2 deletions

diff --git a/src/ejit.c b/src/ejit.c
index 75f6a6a..571a274 100644
--- a/src/ejit.c
+++ b/src/ejit.c
@@ -459,7 +459,7 @@ void ejit_patch(struct ejit_func *f, struct ejit_reloc r, struct ejit_label l)
 void ejit_calli_i(struct ejit_func *s, struct ejit_func *f, size_t argc,
                 const struct ejit_operand args[argc])
 {
-	f->max_args = argc > f->max_args ? argc : f->max_args;
+	s->max_args = argc > s->max_args ? argc : s->max_args;
 	check_operands(f, argc, args);
 
 	for (size_t i = 0; i < argc; ++i) {
@@ -479,7 +479,7 @@ void ejit_calli_l(struct ejit_func *s, struct ejit_func *f, size_t argc,
                 const struct ejit_operand args[argc])
 {
 	s->use_64 = true;
-	f->max_args = argc > f->max_args ? argc : f->max_args;
+	s->max_args = argc > s->max_args ? argc : s->max_args;
 	check_operands(f, argc, args);
 
 	for (size_t i = 0; i < argc; ++i) {
@@ -901,31 +901,37 @@ void ejit_ret(struct ejit_func *s)
 
 void ejit_retr(struct ejit_func *s, struct ejit_gpr r0)
 {
+	assert(s->rtype != EJIT_FLOAT && s->rtype != EJIT_DOUBLE);
 	emit_insn_oxr(s, EJIT_OP_RETR, r0);
 }
 
 void ejit_retr_f(struct ejit_func *s, struct ejit_fpr f0)
 {
+	assert(s->rtype == EJIT_FLOAT);
 	emit_insn_oxf(s, EJIT_OP_RETR_F, f0);
 }
 
 void ejit_retr_d(struct ejit_func *s, struct ejit_fpr f0)
 {
+	assert(s->rtype == EJIT_DOUBLE);
 	emit_insn_oxf(s, EJIT_OP_RETR_D, f0);
 }
 
 void ejit_reti(struct ejit_func *s, int64_t i)
 {
+	assert(s->rtype != EJIT_FLOAT && s->rtype != EJIT_DOUBLE);
 	emit_insn_oi(s, EJIT_OP_RETI, i);
 }
 
 void ejit_reti_f(struct ejit_func *s, float f)
 {
+	assert(s->rtype == EJIT_FLOAT);
 	emit_insn_oF(s, EJIT_OP_RETI_F, f);
 }
 
 void ejit_reti_d(struct ejit_func *s, double f)
 {
+	assert(s->rtype == EJIT_DOUBLE);
 	emit_insn_oD(s, EJIT_OP_RETI_D, f);
 }
 
@@ -1382,6 +1388,26 @@ void ejit_sqrtr_d(struct ejit_func *s, struct ejit_fpr r0, struct ejit_fpr r1)
 	emit_insn_off(s, EJIT_OP_SQRTR_D, r0, r1);
 }
 
+void ejit_minr_f(struct ejit_func *s, struct ejit_fpr r0, struct ejit_fpr r1, struct ejit_fpr r2)
+{
+	emit_insn_offf(s, EJIT_OP_MINR_F, r0, r1, r2);
+}
+
+void ejit_minr_d(struct ejit_func *s, struct ejit_fpr r0, struct ejit_fpr r1, struct ejit_fpr r2)
+{
+	emit_insn_offf(s, EJIT_OP_MINR_D, r0, r1, r2);
+}
+
+void ejit_maxr_f(struct ejit_func *s, struct ejit_fpr r0, struct ejit_fpr r1, struct ejit_fpr r2)
+{
+	emit_insn_offf(s, EJIT_OP_MAXR_F, r0, r1, r2);
+}
+
+void ejit_maxr_d(struct ejit_func *s, struct ejit_fpr r0, struct ejit_fpr r1, struct ejit_fpr r2)
+{
+	emit_insn_offf(s, EJIT_OP_MAXR_D, r0, r1, r2);
+}
+
 struct ejit_reloc ejit_bner(struct ejit_func *s, struct ejit_gpr r0,
                             struct ejit_gpr r1)
 {