commit b49ded3

(uxn.c) Removed z stack assignment

 1@@ -31,8 +31,8 @@ WITH REGARD TO THIS SOFTWARE.
 2 #define SET(mul, add) { if(mul > s->ptr) HALT(1) tmp = (mul & k) + add + s->ptr; if(tmp > 254) HALT(2) s->ptr = tmp; }
 3 #define PUT(o, v) { s->dat[(Uint8)(s->ptr - 1 - (o))] = (v); }
 4 #define PUT2(o, v) { tmp = (v); s->dat[(Uint8)(s->ptr - o - 2)] = tmp >> 8; s->dat[(Uint8)(s->ptr - o - 1)] = tmp; }
 5-#define PUSH(x, v) { z = (x); if(z->ptr > 254) HALT(2) z->dat[z->ptr++] = (v); }
 6-#define PUSH2(x, v) { z = (x); if(z->ptr > 253) HALT(2) tmp = (v); z->dat[z->ptr] = tmp >> 8; z->dat[z->ptr + 1] = tmp; z->ptr += 2; }
 7+#define PUSH(v) { if(s->ptr > 254) HALT(2) s->dat[s->ptr++] = (v); }
 8+#define PUSH2(v) { if(s->ptr > 253) HALT(2) tmp = (v); s->dat[s->ptr] = tmp >> 8; s->dat[s->ptr + 1] = tmp; s->ptr += 2; }
 9 #define DEO(a, b) { u->dev[(a)] = (b); if((deo_mask[(a) >> 4] >> ((a) & 0xf)) & 0x1) uxn_deo(u, (a)); }
10 #define DEI(a, b) { PUT((a), ((dei_mask[(b) >> 4] >> ((b) & 0xf)) & 0x1) ? uxn_dei(u, (b)) : u->dev[(b)]) }
11 
12@@ -41,10 +41,10 @@ uxn_eval(Uxn *u, Uint16 pc)
13 {
14 	int t, n, l, k, tmp, opc, ins;
15 	Uint8 *ram = u->ram;
16-	Stack *s, *z;
17+	Stack *s;
18 	if(!pc || u->dev[0x0f]) return 0;
19 	for(;;) {
20-		ins = ram[pc++] & 0xff;
21+		ins = ram[pc++];
22 		k = ins & 0x80 ? 0xff : 0;
23 		s = ins & 0x40 ? &u->rst : &u->wst;
24 		opc = !(ins & 0x1f) ? (0 - (ins >> 5)) & 0xff : ins & 0x3f;
25@@ -53,11 +53,11 @@ uxn_eval(Uxn *u, Uint16 pc)
26 			case 0x00: /* BRK   */ return 1;
27 			case 0xff: /* JCI   */ pc += !!s->dat[--s->ptr] * PEEK2(ram + pc) + 2; break;
28 			case 0xfe: /* JMI   */ pc += PEEK2(ram + pc) + 2; break;
29-			case 0xfd: /* JSI   */ PUSH2(&u->rst, pc + 2) pc += PEEK2(ram + pc) + 2; break;
30-			case 0xfc: /* LIT   */ PUSH(s, ram[pc++]) break;
31-			case 0xfb: /* LIT2  */ PUSH2(s, PEEK2(ram + pc)) pc += 2; break;
32-			case 0xfa: /* LITr  */ PUSH(s, ram[pc++]) break;
33-			case 0xf9: /* LIT2r */ PUSH2(s, PEEK2(ram + pc)) pc += 2; break;
34+			case 0xfd: /* JSI   */ s = &u->rst; PUSH2(pc + 2) pc += PEEK2(ram + pc) + 2; break;
35+			case 0xfc: /* LIT   */ PUSH(ram[pc++]) break;
36+			case 0xfb: /* LIT2  */ PUSH2(PEEK2(ram + pc)) pc += 2; break;
37+			case 0xfa: /* LITr  */ PUSH(ram[pc++]) break;
38+			case 0xf9: /* LIT2r */ PUSH2(PEEK2(ram + pc)) pc += 2; break;
39 			/* ALU */
40 			case 0x01: /* INC  */ t=T;            SET(1, 0) PUT(0, t + 1) break;
41 			case 0x21:            t=T2;           SET(2, 0) PUT2(0, t + 1) break;
42@@ -83,12 +83,12 @@ uxn_eval(Uxn *u, Uint16 pc)
43 			case 0x2b:            t=T2;n=N2;      SET(4,-3) PUT(0, n < t) break;
44 			case 0x0c: /* JMP  */ t=T;            SET(1,-1) pc += (Sint8)t; break;
45 			case 0x2c:            t=T2;           SET(2,-2) pc = t; break;
46-			case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) pc += !!n * (Sint8)t; break;
47+			case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) if(n) pc += (Sint8)t; break;
48 			case 0x2d:            t=T2;n=L;       SET(3,-3) if(n) pc = t; break;
49-			case 0x0e: /* JSR  */ t=T;            SET(1,-1) PUSH2(&u->rst, pc) pc += (Sint8)t; break;
50-			case 0x2e:            t=T2;           SET(2,-2) PUSH2(&u->rst, pc) pc = t; break;
51-			case 0x0f: /* STH  */ t=T;            SET(1,-1) PUSH((ins & 0x40 ? &u->wst : &u->rst), t) break;
52-			case 0x2f:            t=T2;           SET(2,-2) PUSH2((ins & 0x40 ? &u->wst : &u->rst), t) break;
53+			case 0x0e: /* JSR  */ t=T;            SET(1,-1) s = &u->rst; PUSH2(pc) pc += (Sint8)t; break;
54+			case 0x2e:            t=T2;           SET(2,-2) s = &u->rst; PUSH2(pc) pc = t; break;
55+			case 0x0f: /* STH  */ t=T;            SET(1,-1) s = ins & 0x40 ? &u->wst : &u->rst; PUSH(t) break;
56+			case 0x2f:            t=T2;           SET(2,-2) s = ins & 0x40 ? &u->wst : &u->rst; PUSH2(t) break;
57 			case 0x10: /* LDZ  */ t=T;            SET(1, 0) PUT(0, ram[t]) break;
58 			case 0x30:            t=T;            SET(1, 1) PUT2(0, PEEK2(ram + t)) break;
59 			case 0x11: /* STZ  */ t=T;n=N;        SET(2,-2) ram[t] = n; break;