commit 4eac885

(uxn.c)Removed scopes around macros

 1@@ -12,35 +12,35 @@ WITH REGARD TO THIS SOFTWARE.
 2 */
 3 
 4 #define OPC(opc, init, body) {\
 5-	case 0x00|opc: {enum{_2=0,_r=0}; init; body; break;}\
 6-	case 0x20|opc: {enum{_2=1,_r=0}; init; body; break;}\
 7-	case 0x40|opc: {enum{_2=0,_r=1}; init; body; break;}\
 8-	case 0x60|opc: {enum{_2=1,_r=1}; init; body; break;}\
 9-	case 0x80|opc: {enum{_2=0,_r=0}; k = uxn.wst.ptr; init; uxn.wst.ptr = k; body; break;}\
10-	case 0xa0|opc: {enum{_2=1,_r=0}; k = uxn.wst.ptr; init; uxn.wst.ptr = k; body; break;}\
11-	case 0xc0|opc: {enum{_2=0,_r=1}; k = uxn.rst.ptr; init; uxn.rst.ptr = k; body; break;}\
12-	case 0xe0|opc: {enum{_2=1,_r=1}; k = uxn.rst.ptr; init; uxn.rst.ptr = k; body; break;}\
13+	case 0x00|opc: {enum{_2=0,_r=0};init;body;} break;\
14+	case 0x20|opc: {enum{_2=1,_r=0};init;body;} break;\
15+	case 0x40|opc: {enum{_2=0,_r=1};init;body;} break;\
16+	case 0x60|opc: {enum{_2=1,_r=1};init;body;} break;\
17+	case 0x80|opc: {enum{_2=0,_r=0};k=uxn.wst.ptr;init;uxn.wst.ptr= k;body;} break;\
18+	case 0xa0|opc: {enum{_2=1,_r=0};k=uxn.wst.ptr;init;uxn.wst.ptr= k;body;} break;\
19+	case 0xc0|opc: {enum{_2=0,_r=1};k=uxn.rst.ptr;init;uxn.rst.ptr= k;body;} break;\
20+	case 0xe0|opc: {enum{_2=1,_r=1};k=uxn.rst.ptr;init;uxn.rst.ptr= k;body;} break;\
21 }
22 
23 /* Microcode */
24 
25 #define INC(s) uxn.s.dat[uxn.s.ptr++]
26 #define DEC(s) uxn.s.dat[--uxn.s.ptr]
27-#define JMI { pc += uxn.ram[pc++] << 8 | uxn.ram[pc++]; }
28-#define JMP(x) { if(_2) pc = (x); else pc += (Sint8)(x); }
29-#define POx(o) { if(_2) { PO2(o) } else PO1(o) }
30-#define PO2(o) { if(_r) o = DEC(rst) | (DEC(rst) << 8); else o = DEC(wst) | (DEC(wst) << 8); }
31-#define PO1(o) { if(_r) o = DEC(rst); else o = DEC(wst); }
32-#define PUx(y) { if(_2) { PU2(y) } else PU1(y) }
33-#define PU2(y) { tt = (y); PU1(tt >> 8) PU1(tt) }
34-#define PU1(y) { if(_r) INC(rst) = y; else INC(wst) = y; }
35-#define PFx(y) { if(_2) { PF2(y) } else PF1(y) }
36-#define PF2(y) { tt = (y); PF1(tt >> 8) PF1(tt) }
37-#define PF1(y) { if(_r) INC(wst) = y; else INC(rst) = y; }
38-#define DEI(p, o) { if(_2) { o = (emu_dei(p) << 8) | emu_dei(p + 1); } else o = emu_dei(p); }
39-#define DEO(p, y) { if(_2) { emu_deo(p, y >> 8), emu_deo(p + 1, y); } else emu_deo(p, y); }
40-#define PEK(o, x, r) { if(_2) { r = (x); o = uxn.ram[r++] << 8 | uxn.ram[r]; } else o = uxn.ram[(x)]; }
41-#define POK(x, y, r) { if(_2) { r = (x); uxn.ram[r++] = y >> 8, uxn.ram[r] = y; } else uxn.ram[(x)] = (y); }
42+#define JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++];
43+#define JMP(x) if(_2) pc = (x); else pc += (Sint8)(x);
44+#define POx(o) if(_2) { PO2(o) } else PO1(o)
45+#define PO2(o) if(_r) o = DEC(rst) | (DEC(rst) << 8); else o = DEC(wst) | (DEC(wst) << 8);
46+#define PO1(o) if(_r) o = DEC(rst); else o = DEC(wst);
47+#define PUx(y) if(_2) { PU2(y) } else PU1(y)
48+#define PU2(y) tt = (y); PU1(tt >> 8) PU1(tt)
49+#define PU1(y) if(_r) INC(rst) = y; else INC(wst) = y;
50+#define PFx(y) if(_2) { PF2(y) } else PF1(y)
51+#define PF2(y) tt = (y); PF1(tt >> 8) PF1(tt)
52+#define PF1(y) if(_r) INC(wst) = y; else INC(rst) = y;
53+#define DEI(p, o) if(_2) { o = (emu_dei(p) << 8) | emu_dei(p + 1); } else o = emu_dei(p);
54+#define DEO(p, y) if(_2) { emu_deo(p, y >> 8), emu_deo(p + 1, y); } else emu_deo(p, y);
55+#define PEK(o, x, r) if(_2) { r = (x); o = uxn.ram[r++] << 8 | uxn.ram[r]; } else o = uxn.ram[(x)];
56+#define POK(x, y, r) if(_2) { r = (x); uxn.ram[r++] = y >> 8, uxn.ram[r] = y; } else uxn.ram[(x)] = (y);
57 
58 int
59 uxn_eval(Uint16 pc)