commit 6b97172

(uxn.c) Wrapping zp

 1@@ -11,24 +11,24 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 2 WITH REGARD TO THIS SOFTWARE.
 3 */
 4 
 5-#define FLIP       { s = ins & 0x40 ? &u->wst : &u->rst; }
 6-#define JUMP(x)    { if(m2) pc = (x); else pc += (Sint8)(x); }
 7-#define POKE(x, y) { if(m2) { t = (x); ram[t++] = y >> 8; ram[t] = y; } else ram[(x)] = (y); }
 8-#define PEEK(o, x) { if(m2) { t = (x); o = ram[t++] << 8 | ram[t]; } else o = ram[(x)]; }
 9-#define DEVR(o, p) { if(m2) { o = (emu_dei(u, p) << 8) | emu_dei(u, p + 1); } else o = emu_dei(u, p); }
10-#define DEVW(p, y) { if(m2) { emu_deo(u, p, y >> 8); emu_deo(u, p + 1, y); } else emu_deo(u, p, y); }
11-#define PUSH1(y)   { s->dat[s->ptr++] = (y); }
12-#define PUSH2(y)   { t = (y); s->dat[s->ptr++] = t >> 0x8; s->dat[s->ptr++] = t; }
13-#define PUSHx(y)   { if(m2) { PUSH2(y) } else PUSH1(y) }
14-#define POP1(o)    { o = s->dat[--*sp]; }
15-#define POP2(o)    { o = s->dat[--*sp] | (s->dat[--*sp] << 0x8); }
16-#define POPx(o)    { if(m2) { POP2(o) } else POP1(o) }
17+#define FLIP     { s = ins & 0x40 ? &u->wst : &u->rst; }
18+#define JUMP(x)  { if(m2) pc = (x); else pc += (Sint8)(x); }
19+#define PUSH1(y) { s->dat[s->ptr++] = (y); }
20+#define PUSH2(y) { tt = (y); s->dat[s->ptr++] = tt >> 0x8; s->dat[s->ptr++] = tt; }
21+#define PUSHx(y) { if(m2) { PUSH2(y) } else PUSH1(y) }
22+#define POP1(o)  { o = s->dat[--*sp]; }
23+#define POP2(o)  { o = s->dat[--*sp] | (s->dat[--*sp] << 0x8); }
24+#define POPx(o)  { if(m2) { POP2(o) } else POP1(o) }
25+#define POKE(x, y, r) { if(m2) { r = (x); ram[r++] = y >> 8; ram[r] = y; } else ram[(x)] = (y); }
26+#define PEEK(o, x, r) { if(m2) { r = (x); o = ram[r++] << 8 | ram[r]; } else o = ram[(x)]; }
27+#define DEVR(o, p)    { if(m2) { o = (emu_dei(u, p) << 8) | emu_dei(u, p + 1); } else o = emu_dei(u, p); }
28+#define DEVW(p, y)    { if(m2) { emu_deo(u, p, y >> 8); emu_deo(u, p + 1, y); } else emu_deo(u, p, y); }
29 
30 int
31 uxn_eval(Uxn *u, Uint16 pc)
32 {
33-	Uint8 ksp, *sp, *tp, *ram = u->ram;
34-	Uint16 a, b, c, t;
35+	Uint8 t, ksp, *sp, *tp, *ram = u->ram;
36+	Uint16 tt, a, b, c;
37 	if(!pc || u->dev[0x0f]) return 0;
38 	for(;;) {
39 		Uint8 ins = ram[pc++], opc = ins & 0x1f;
40@@ -66,12 +66,12 @@ uxn_eval(Uxn *u, Uint16 pc)
41 		case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break;
42 		case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break;
43 		case 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break;
44-		case 0x10: /* LDZ */ POP1(a) PEEK(b, a) PUSHx(b) break;
45-		case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b) break;
46-		case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a) PUSHx(b) break;
47-		case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b) break;
48-		case 0x14: /* LDA */ POP2(a) PEEK(b, a) PUSHx(b) break;
49-		case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b) break;
50+		case 0x10: /* LDZ */ POP1(a) PEEK(b, a, t) PUSHx(b) break;
51+		case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b, t) break;
52+		case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a, tt) PUSHx(b) break;
53+		case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b, tt) break;
54+		case 0x14: /* LDA */ POP2(a) PEEK(b, a, tt) PUSHx(b) break;
55+		case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b, tt) break;
56 		case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break;
57 		case 0x17: /* DEO */ POP1(a) POPx(b) DEVW(a, b) break;
58 		case 0x18: /* ADD */ POPx(a) POPx(b) PUSHx(b + a) break;