Restore eda2c756edc4dca004ba217d5bf361235dd9de1f

1 files changed, 32 insertions, 1 deletions

diff --git a/c67-gen.c b/c67-gen.c
index a26dfaa..209fa7f 100644
--- a/c67-gen.c
+++ b/c67-gen.c
@@ -2102,7 +2102,7 @@ int gtst(int inv, int t)
 	C67_NOP(5);
 	t = ind1;		//return where we need to patch
 
-    } else { /* VT_JMP || VT_JMPI */
+    } else if (v == VT_JMP || v == VT_JMPI) {
 	/* && or || optimization */
 	if ((v & 1) == inv) {
 	    /* insert vtop->c jump list in t */
@@ -2128,6 +2128,37 @@ int gtst(int inv, int t)
 	    t = gjmp(t);
 	    gsym(vtop->c.i);
 	}
+	} else {
+		if (is_float(vtop->type.t)) {
+			vpushi(0);
+			gen_op(TOK_NE);
+		}
+		if ((vtop->r & (VT_VALMASK | VT_LVAL | VT_SYM)) == VT_CONST) {
+			/* constant jmp optimization */
+			if ((vtop->c.i != 0) != inv)
+			t = gjmp(t);
+		} else {
+			// I think we need to get the value on the stack
+			// into a register, test it, and generate a branch
+			// return the address of the branch, so it can be
+			// later patched
+
+			v = gv(RC_INT);	// get value into a reg 
+			ind1 = ind;
+			C67_MVKL(C67_A0, t);	//r=reg to load, constant
+			C67_MVKH(C67_A0, t);	//r=reg to load, constant
+
+			if (v != TREG_EAX &&	// check if not already in a conditional test reg
+			v != TREG_EDX && v != TREG_ST0 && v != C67_B2) {
+			C67_MV(v, C67_B2);
+			v = C67_B2;
+			}
+
+			C67_IREG_B_REG(inv, v, C67_A0);	// [!R] B.S2x  A0
+			C67_NOP(5);
+			t = ind1;		//return where we need to patch
+			ind1 = ind;
+		}
     }
     vtop--;
     return t;