Fixing jmp operations

libs/turmit.c

@@ -101,7 +101,9 @@ TURMIT_OP(swp)
 
 TURMIT_OP(jmp)
 {
-	turmit->op_cur += SPOP(turmit) - 1;
+	turmit_int a;
+	a = SPOP(turmit);
+	TURMIT_JMP(turmit, a);
 }
 
 TURMIT_OP(jz)
@@ -111,7 +113,7 @@ TURMIT_OP(jz)
 	b = SPOP(turmit);
 	if(b == 0)
 	{
-		turmit->op_cur += a - 1;
+		TURMIT_JMP(turmit, a);
 	}
 }
 
@@ -125,7 +127,7 @@ TURMIT_OP(jcmp)
 	if(((cnd & 7) == 0 && a != b) || (cnd > 6) || ((cnd & 1) && a == b) ||
 		((cnd & 7) > 2 && a < b) || ((cnd & 7) > 4 && a > b))
 	{
-		turmit->op_cur += offset - 1;
+		TURMIT_JMP(turmit, offset);
 	}
 }
 
@@ -152,6 +154,7 @@ turmit_t *turmit_init(turmit_t *turmit, ssize_t stack_sz, ssize_t int_max,
 	turmit->op_expr = NULL;
 	turmit->op_expr_sz = 0;
 	turmit->op_cur = 0;
+	turmit->op_end = 0;
 	turmit->stack_sz = stack_sz;
 	turmit->stack_cur = turmit->stack_sz - 1;
 	turmit->stack = malloc(sizeof(turmit_int) * turmit->stack_sz);
@@ -225,7 +228,8 @@ turmit_int turmit_exec(turmit_t *turmit, const turmit_int args[5])
 	turmit_op_t *op;
 
 	turmit->op_cur = 0;
-	while(turmit->op_cur < turmit->op_expr_sz)
+	turmit->op_end = 0;
+	while(!turmit->op_end && turmit->op_cur < turmit->op_expr_sz)
 	{
 		op = &(turmit->op_expr[turmit->op_cur]);
 		switch(op->value)

libs/turmit.h

@@ -22,6 +22,9 @@ typedef void (*turmit_op_f)(turmit_t*);
 #define SPOP(t) (__SPOP(t))
 #define SPUSH(t, v) (t->stack[SINC(t)] = v % t->int_max)
 
+#define TURMIT_JMP(t, v) (((t->op_expr_sz - t->op_cur) <= v)?\
+	(t->op_end=1):\
+	(t->op_cur += (v>0?v-1:0) ))
 
 #define TURMIT_EXPR_MAX_SZ	0xFFFFFFFF
 
@@ -92,6 +95,7 @@ struct turmit_s
 	turmit_op_t *op_expr;
 	ssize_t op_expr_sz;
 	ssize_t op_cur;
+	short op_end;
 
 	ssize_t stack_sz;
 	turmit_int *stack;