commit ae02c19
Devine Lu Linvega
·
2024-11-12 17:16:09 +0000 UTC
parent bd05808
(uxn.c) Cleanup
1 files changed,
+40,
-40
+40,
-40
1@@ -25,18 +25,18 @@ WITH REGARD TO THIS SOFTWARE.
2 /* Microcode */
3
4 #define JMI a = uxn.ram[pc] << 8 | uxn.ram[pc + 1], pc += a + 2;
5-#define JMP(i) if(_2) pc = i; else pc += (Sint8)i;
6 #define REM if(_r) uxn.rst.ptr -= 1 + _2; else uxn.wst.ptr -= 1 + _2;
7 #define INC(s) uxn.s.dat[uxn.s.ptr++]
8 #define DEC(s) uxn.s.dat[--uxn.s.ptr]
9-#define PO1(o) o = _r ? DEC(rst) : DEC(wst);
10-#define PO2(o) PO1(o) o |= (_r ? DEC(rst) : DEC(wst)) << 8;
11-#define POx(o) if(_2) { PO2(o) } else PO1(o)
12-#define PU1(i) if(_r) INC(rst) = i; else INC(wst) = i;
13-#define RP1(i) if(_r) INC(wst) = i; else INC(rst) = i;
14-#define PUx(i) if(_2) { c = (i); PU1(c >> 8) PU1(c) } else PU1(i)
15-#define GET(o) if(_2) PO1(o[1]) PO1(o[0])
16-#define PUT(i) PU1(i[0]) if(_2) PU1(i[1])
17+#define JMP(i) { if(_2) pc = i; else pc += (Sint8)i; }
18+#define PO1(o) { o = _r ? DEC(rst) : DEC(wst); }
19+#define PO2(o) { PO1(o) o |= (_r ? DEC(rst) : DEC(wst)) << 8; }
20+#define POx(o) { if(_2) { PO2(o) } else PO1(o) }
21+#define PU1(i) { if(_r) INC(rst) = i; else INC(wst) = i; }
22+#define RP1(i) { if(_r) INC(wst) = i; else INC(rst) = i; }
23+#define PUx(i) { if(_2) { c = (i); PU1(c >> 8) PU1(c) } else PU1(i) }
24+#define GET(o) { if(_2) PO1(o[1]) PO1(o[0]) }
25+#define PUT(i) { PU1(i[0]) if(_2) PU1(i[1]) }
26 #define DEI(i,o) o[0] = emu_dei(i); if(_2) o[1] = emu_dei(i + 1); PUT(o)
27 #define DEO(i,j) emu_deo(i, j[0]); if(_2) emu_deo(i + 1, j[1]);
28 #define PEK(i,o,m) o[0] = uxn.ram[i]; if(_2) o[1] = uxn.ram[(i + 1) & m]; PUT(o)
29@@ -57,37 +57,37 @@ uxn_eval(Uint16 pc)
30 /* LIT */ case 0x80: INC(wst) = uxn.ram[pc++]; break;
31 /* L2r */ case 0xe0: INC(rst) = uxn.ram[pc++]; /* fall-through */
32 /* LIr */ case 0xc0: INC(rst) = uxn.ram[pc++]; break;
33- /* INC */ OPC(0x01, POx(a), PUx(a + 1))
34- /* POP */ OPC(0x02, REM, {})
35- /* NIP */ OPC(0x03, GET(x) REM,PUT(x))
36- /* SWP */ OPC(0x04, GET(x) GET(y),PUT(x) PUT(y))
37- /* ROT */ OPC(0x05, GET(x) GET(y) GET(z),PUT(y) PUT(x) PUT(z))
38- /* DUP */ OPC(0x06, GET(x),PUT(x) PUT(x))
39- /* OVR */ OPC(0x07, GET(x) GET(y),PUT(y) PUT(x) PUT(y))
40- /* EQU */ OPC(0x08, POx(a) POx(b),PU1(b == a))
41- /* NEQ */ OPC(0x09, POx(a) POx(b),PU1(b != a))
42- /* GTH */ OPC(0x0a, POx(a) POx(b),PU1(b > a))
43- /* LTH */ OPC(0x0b, POx(a) POx(b),PU1(b < a))
44- /* JMP */ OPC(0x0c, POx(a),JMP(a))
45- /* JCN */ OPC(0x0d, POx(a) PO1(b), if(b) JMP(a))
46- /* JSR */ OPC(0x0e, POx(a),RP1(pc >> 8) RP1(pc) JMP(a))
47- /* STH */ OPC(0x0f, GET(x),RP1(x[0]) if(_2) RP1(x[1]))
48- /* LDZ */ OPC(0x10, PO1(a),PEK(a, x, 0xff))
49- /* STZ */ OPC(0x11, PO1(a) GET(y),POK(a, y, 0xff))
50- /* LDR */ OPC(0x12, PO1(a),PEK(pc + (Sint8)a, x, 0xffff))
51- /* STR */ OPC(0x13, PO1(a) GET(y),POK(pc + (Sint8)a, y, 0xffff))
52- /* LDA */ OPC(0x14, PO2(a),PEK(a, x, 0xffff))
53- /* STA */ OPC(0x15, PO2(a) GET(y),POK(a, y, 0xffff))
54- /* DEI */ OPC(0x16, PO1(a),DEI(a, x))
55- /* DEO */ OPC(0x17, PO1(a) GET(y),DEO(a, y))
56- /* ADD */ OPC(0x18, POx(a) POx(b),PUx(b + a))
57- /* SUB */ OPC(0x19, POx(a) POx(b),PUx(b - a))
58- /* MUL */ OPC(0x1a, POx(a) POx(b),PUx(b * a))
59- /* DIV */ OPC(0x1b, POx(a) POx(b),PUx(a ? b / a : 0))
60- /* AND */ OPC(0x1c, POx(a) POx(b),PUx(b & a))
61- /* ORA */ OPC(0x1d, POx(a) POx(b),PUx(b | a))
62- /* EOR */ OPC(0x1e, POx(a) POx(b),PUx(b ^ a))
63- /* SFT */ OPC(0x1f, PO1(a) POx(b),PUx(b >> (a & 0xf) << (a >> 4)))
64+ /* INC */ OPC(0x01,POx(a),PUx(a + 1))
65+ /* POP */ OPC(0x02,REM ,{})
66+ /* NIP */ OPC(0x03,GET(x) REM ,PUT(x))
67+ /* SWP */ OPC(0x04,GET(x) GET(y),PUT(x) PUT(y))
68+ /* ROT */ OPC(0x05,GET(x) GET(y) GET(z),PUT(y) PUT(x) PUT(z))
69+ /* DUP */ OPC(0x06,GET(x),PUT(x) PUT(x))
70+ /* OVR */ OPC(0x07,GET(x) GET(y),PUT(y) PUT(x) PUT(y))
71+ /* EQU */ OPC(0x08,POx(a) POx(b),PU1(b == a))
72+ /* NEQ */ OPC(0x09,POx(a) POx(b),PU1(b != a))
73+ /* GTH */ OPC(0x0a,POx(a) POx(b),PU1(b > a))
74+ /* LTH */ OPC(0x0b,POx(a) POx(b),PU1(b < a))
75+ /* JMP */ OPC(0x0c,POx(a),JMP(a))
76+ /* JCN */ OPC(0x0d,POx(a) PO1(b),if(b) JMP(a))
77+ /* JSR */ OPC(0x0e,POx(a),RP1(pc >> 8) RP1(pc) JMP(a))
78+ /* STH */ OPC(0x0f,GET(x),RP1(x[0]) if(_2) RP1(x[1]))
79+ /* LDZ */ OPC(0x10,PO1(a),PEK(a, x, 0xff))
80+ /* STZ */ OPC(0x11,PO1(a) GET(y),POK(a, y, 0xff))
81+ /* LDR */ OPC(0x12,PO1(a),PEK(pc + (Sint8)a, x, 0xffff))
82+ /* STR */ OPC(0x13,PO1(a) GET(y),POK(pc + (Sint8)a, y, 0xffff))
83+ /* LDA */ OPC(0x14,PO2(a),PEK(a, x, 0xffff))
84+ /* STA */ OPC(0x15,PO2(a) GET(y),POK(a, y, 0xffff))
85+ /* DEI */ OPC(0x16,PO1(a),DEI(a, x))
86+ /* DEO */ OPC(0x17,PO1(a) GET(y),DEO(a, y))
87+ /* ADD */ OPC(0x18,POx(a) POx(b),PUx(b + a))
88+ /* SUB */ OPC(0x19,POx(a) POx(b),PUx(b - a))
89+ /* MUL */ OPC(0x1a,POx(a) POx(b),PUx(b * a))
90+ /* DIV */ OPC(0x1b,POx(a) POx(b),PUx(a ? b / a : 0))
91+ /* AND */ OPC(0x1c,POx(a) POx(b),PUx(b & a))
92+ /* ORA */ OPC(0x1d,POx(a) POx(b),PUx(b | a))
93+ /* EOR */ OPC(0x1e,POx(a) POx(b),PUx(b ^ a))
94+ /* SFT */ OPC(0x1f,PO1(a) POx(b),PUx(b >> (a & 0xf) << (a >> 4)))
95 }
96 }
97 return 0;