commit ab08601

(uxn.c) Use similar macro var names

 1@@ -24,10 +24,10 @@ WITH REGARD TO THIS SOFTWARE.
 2 
 3 /* Microcode */
 4 
 5+#define JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++];
 6+#define JMP(j) if(_2) pc = (j); else pc += (Sint8)(j);
 7 #define INC(s) uxn.s.dat[uxn.s.ptr++]
 8 #define DEC(s) uxn.s.dat[--uxn.s.ptr]
 9-#define JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++];
10-#define JMP(x) if(_2) pc = (x); else pc += (Sint8)(x);
11 #define POx(o) if(_2) { PO2(o) } else PO1(o)
12 #define PO2(o) if(_r) o = DEC(rst) | (DEC(rst) << 8); else o = DEC(wst) | (DEC(wst) << 8);
13 #define PO1(o) if(_r) o = DEC(rst); else o = DEC(wst);
14@@ -37,13 +37,12 @@ WITH REGARD TO THIS SOFTWARE.
15 #define PFx(y) if(_2) { PF2(y) } else PF1(y)
16 #define PF2(y) tt = (y); PF1(tt >> 8) PF1(tt)
17 #define PF1(y) if(_r) INC(wst) = y; else INC(rst) = y;
18-
19-#define GET(x,y) if(_2) PO1(y) PO1(x)
20-#define PUT(x,y) PU1(x) if(_2) PU1(y)
21-#define DEI(p, o) if(_2) { o = (emu_dei(p) << 8) | emu_dei(p + 1); } else o = emu_dei(p);
22-#define DEO(p, y) if(_2) { emu_deo(p, y >> 8), emu_deo(p + 1, y); } else emu_deo(p, y);
23-#define PEK(o, p, x, r) o = uxn.ram[x]; if(_2) { r = x + 1; p = uxn.ram[r]; } 
24-#define POK(x, y, z, r) uxn.ram[x] = y; if(_2) { r = x + 1; uxn.ram[r] = z; }
25+#define GET(o,p) if(_2) PO1(p) PO1(o)
26+#define PUT(y,z) PU1(y) if(_2) PU1(z)
27+#define DEI(i,o,p) o = emu_dei(i); if(_2) p = emu_dei(i + 1);
28+#define DEO(i,y,z) emu_deo(i, y); if(_2) emu_deo(i + 1, z);
29+#define PEK(i,o,p,r) o = uxn.ram[i]; if(_2) r = i + 1, p = uxn.ram[r];
30+#define POK(i,y,z,r) uxn.ram[i] = y; if(_2) r = i + 1, uxn.ram[r] = z;
31 
32 int
33 uxn_eval(Uint16 pc)
34@@ -77,14 +76,14 @@ uxn_eval(Uint16 pc)
35 		/* JCN */ OPC(0x0d, POx(a) PO1(b), if(b) JMP(a))
36 		/* JSR */ OPC(0x0e, POx(a),PF2(pc) JMP(a))
37 		/* STH */ OPC(0x0f, POx(a),PFx(a))
38-		/* LDZ */ OPC(0x10, PO1(a),PEK(b, c, a, t) PUT(b,c))
39-		/* STZ */ OPC(0x11, PO1(a) GET(b,c),POK(a, b, c, t))
40-		/* LDR */ OPC(0x12, PO1(a),PEK(b, c, pc + (Sint8)a, tt) PUT(b,c))
41-		/* STR */ OPC(0x13, PO1(a) GET(b,c),POK(pc + (Sint8)a, b, c, tt))
42-		/* LDA */ OPC(0x14, PO2(a),PEK(b, c, a, tt) PUT(b,c))
43-		/* STA */ OPC(0x15, PO2(a) GET(b,c),POK(a, b, c, tt))
44-		/* DEI */ OPC(0x16, PO1(a),DEI(a, b) PUx(b))
45-		/* DEO */ OPC(0x17, PO1(a) POx(b),DEO(a, b))
46+		/* LDZ */ OPC(0x10, PO1(a),PEK(a,b,c,t) PUT(b,c))
47+		/* STZ */ OPC(0x11, PO1(a) GET(b,c),POK(a,b,c,t))
48+		/* LDR */ OPC(0x12, PO1(a),PEK(pc+(Sint8)a,b,c,tt) PUT(b,c))
49+		/* STR */ OPC(0x13, PO1(a) GET(b,c),POK(pc+(Sint8)a,b,c,tt))
50+		/* LDA */ OPC(0x14, PO2(a),PEK(a,b,c,tt) PUT(b,c))
51+		/* STA */ OPC(0x15, PO2(a) GET(b,c),POK(a,b,c,tt))
52+		/* DEI */ OPC(0x16, PO1(a),DEI(a,b,c) PUT(b,c))
53+		/* DEO */ OPC(0x17, PO1(a) GET(b,c),DEO(a,b,c))
54 		/* ADD */ OPC(0x18, POx(a) POx(b),PUx(b + a))
55 		/* SUB */ OPC(0x19, POx(a) POx(b),PUx(b - a))
56 		/* MUL */ OPC(0x1a, POx(a) POx(b),PUx(b * a))