commit 91cd380
Devine Lu Linvega
·
2024-08-17 23:26:04 +0000 UTC
parent d1268a8
(uxn.c) Housekeeping
1 files changed,
+46,
-53
+46,
-53
1@@ -12,42 +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};int k=uxn.wst.ptr;init;uxn.wst.ptr= k;body;} break;\
10- case 0xa0|opc: {enum{_2=1,_r=0};int k=uxn.wst.ptr;init;uxn.wst.ptr= k;body;} break;\
11- case 0xc0|opc: {enum{_2=0,_r=1};int k=uxn.rst.ptr;init;uxn.rst.ptr= k;body;} break;\
12- case 0xe0|opc: {enum{_2=1,_r=1};int 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};int k=uxn.wst.ptr;init uxn.wst.ptr= k;body;} break;\
18+ case 0xa0|opc: {enum{_2=1,_r=0};int k=uxn.wst.ptr;init uxn.wst.ptr= k;body;} break;\
19+ case 0xc0|opc: {enum{_2=0,_r=1};int k=uxn.rst.ptr;init uxn.rst.ptr= k;body;} break;\
20+ case 0xe0|opc: {enum{_2=1,_r=1};int k=uxn.rst.ptr;init uxn.rst.ptr= k;body;} break;\
21 }
22
23 /* Microcode */
24+
25 #define JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++];
26 #define JMP(i) if(_2) pc = (i); else pc += (Sint8)(i);
27-/* stack-registers */
28 #define REM if(_r) uxn.rst.ptr -= 1 + _2; else uxn.wst.ptr -= 1 + _2;
29 #define INC(s) uxn.s.dat[uxn.s.ptr++]
30 #define DEC(s) uxn.s.dat[--uxn.s.ptr]
31-#define POP(o) if(_r) o = DEC(rst); else o = DEC(wst);
32-#define PUx(i) if(_2) { tt = (i); PU1(tt >> 8) PU1(tt) } else PU1(i)
33+#define PO1(o) if(_r) o = DEC(rst); else o = DEC(wst);
34 #define PU1(i) if(_r) INC(rst) = i; else INC(wst) = i;
35+#define PUx(i) if(_2) { tt = (i); PU1(tt >> 8) PU1(tt) } else PU1(i)
36 #define RP1(i) if(_r) INC(wst) = i; else INC(rst) = i;
37-#define A if(_2) { A2 } else A1
38-#define A1 POP(a)
39-#define A2 if(_r) a = DEC(rst) | (DEC(rst) << 8); else a = DEC(wst) | (DEC(wst) << 8);
40-#define B if(_2) { B2 } else B1
41-#define B1 POP(b)
42-#define B2 if(_r) b = DEC(rst) | (DEC(rst) << 8); else b = DEC(wst) | (DEC(wst) << 8);
43-/* memory-registers */
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 PUT(i) PU1(i[0]) if(_2) PU1(i[1])
47-#define DEI(i,o) o[0] =emu_dei(i); if(_2) o[1] =emu_dei(i + 1);
48+#define GET(o) if(_2) PO1(o[1]) PO1(o[0])
49+#define DEI(i,o) o[0] =emu_dei(i); if(_2) o[1] =emu_dei(i + 1); PUT(o)
50 #define DEO(i,j) emu_deo(i, j[0]); if(_2) emu_deo(i + 1, j[1]);
51-#define PEK(i,o,m) o[0] = uxn.ram[i]; if(_2) o[1] = uxn.ram[(i + 1) & m];
52+#define PEK(i,o,m) o[0] = uxn.ram[i]; if(_2) o[1] = uxn.ram[(i + 1) & m]; PUT(o)
53 #define POK(i,j,m) uxn.ram[i] = j[0]; if(_2) uxn.ram[(i + 1) & m] = j[1];
54-#define X if(_2) POP(x[1]) POP(x[0])
55-#define Y if(_2) POP(y[1]) POP(y[0])
56-#define Z if(_2) POP(z[1]) POP(z[0])
57
58 int
59 uxn_eval(Uint16 pc)
60@@ -65,37 +58,37 @@ uxn_eval(Uint16 pc)
61 /* LIT */ case 0x80: INC(wst) = uxn.ram[pc++]; break;
62 /* L2r */ case 0xe0: INC(rst) = uxn.ram[pc++];
63 /* LIr */ case 0xc0: INC(rst) = uxn.ram[pc++]; break;
64- /* INC */ OPC(0x01, A, PUx(a + 1))
65+ /* INC */ OPC(0x01, POx(a), PUx(a + 1))
66 /* POP */ OPC(0x02, REM, 0)
67- /* NIP */ OPC(0x03, X REM, PUT(x))
68- /* SWP */ OPC(0x04, X Y, PUT(x) PUT(y))
69- /* ROT */ OPC(0x05, X Y Z, PUT(y) PUT(x) PUT(z))
70- /* DUP */ OPC(0x06, X, PUT(x) PUT(x))
71- /* OVR */ OPC(0x07, X Y, PUT(y) PUT(x) PUT(y))
72- /* EQU */ OPC(0x08, A B, PU1(b == a))
73- /* NEQ */ OPC(0x09, A B, PU1(b != a))
74- /* GTH */ OPC(0x0a, A B, PU1(b > a))
75- /* LTH */ OPC(0x0b, A B, PU1(b < a))
76- /* JMP */ OPC(0x0c, A, JMP(a))
77- /* JCN */ OPC(0x0d, A B1, if(b) JMP(a))
78- /* JSR */ OPC(0x0e, A, RP1(pc >> 8) RP1(pc) JMP(a))
79- /* STH */ OPC(0x0f, X, RP1(x[0]) if(_2) RP1(x[1]))
80- /* LDZ */ OPC(0x10, A1, PEK(a, x, 0xff) PUT(x))
81- /* STZ */ OPC(0x11, A1 Y, POK(a, y, 0xff))
82- /* LDR */ OPC(0x12, A1, PEK(pc+(Sint8)a, x, 0xffff) PUT(x))
83- /* STR */ OPC(0x13, A1 Y, POK(pc+(Sint8)a, y, 0xffff))
84- /* LDA */ OPC(0x14, A2, PEK(a, x, 0xffff) PUT(x))
85- /* STA */ OPC(0x15, A2 Y, POK(a, y, 0xffff))
86- /* DEI */ OPC(0x16, A1, DEI(a, x) PUT(x))
87- /* DEO */ OPC(0x17, A1 Y, DEO(a, y))
88- /* ADD */ OPC(0x18, A B, PUx(b + a))
89- /* SUB */ OPC(0x19, A B, PUx(b - a))
90- /* MUL */ OPC(0x1a, A B, PUx(b * a))
91- /* DIV */ OPC(0x1b, A B, PUx(a ? b / a : 0))
92- /* AND */ OPC(0x1c, A B, PUx(b & a))
93- /* ORA */ OPC(0x1d, A B, PUx(b | a))
94- /* EOR */ OPC(0x1e, A B, PUx(b ^ a))
95- /* SFT */ OPC(0x1f, A1 B, PUx(b >> (a & 0xf) << (a >> 4)))
96+ /* NIP */ OPC(0x03, GET(x) REM,PUT(x))
97+ /* SWP */ OPC(0x04, GET(x) GET(y),PUT(x) PUT(y))
98+ /* ROT */ OPC(0x05, GET(x) GET(y) GET(z),PUT(y) PUT(x) PUT(z))
99+ /* DUP */ OPC(0x06, GET(x),PUT(x) PUT(x))
100+ /* OVR */ OPC(0x07, GET(x) GET(y),PUT(y) PUT(x) PUT(y))
101+ /* EQU */ OPC(0x08, POx(a) POx(b),PU1(b == a))
102+ /* NEQ */ OPC(0x09, POx(a) POx(b),PU1(b != a))
103+ /* GTH */ OPC(0x0a, POx(a) POx(b),PU1(b > a))
104+ /* LTH */ OPC(0x0b, POx(a) POx(b),PU1(b < a))
105+ /* JMP */ OPC(0x0c, POx(a),JMP(a))
106+ /* JCN */ OPC(0x0d, POx(a) PO1(b), if(b) JMP(a))
107+ /* JSR */ OPC(0x0e, POx(a),RP1(pc >> 8) RP1(pc) JMP(a))
108+ /* STH */ OPC(0x0f, GET(x),RP1(x[0]) if(_2) RP1(x[1]))
109+ /* LDZ */ OPC(0x10, PO1(a),PEK(a, x, 0xff))
110+ /* STZ */ OPC(0x11, PO1(a) GET(y),POK(a, y, 0xff))
111+ /* LDR */ OPC(0x12, PO1(a),PEK(pc + (Sint8)a, x, 0xffff))
112+ /* STR */ OPC(0x13, PO1(a) GET(y),POK(pc + (Sint8)a, y, 0xffff))
113+ /* LDA */ OPC(0x14, PO2(a),PEK(a, x, 0xffff))
114+ /* STA */ OPC(0x15, PO2(a) GET(y),POK(a, y, 0xffff))
115+ /* DEI */ OPC(0x16, PO1(a),DEI(a, x))
116+ /* DEO */ OPC(0x17, PO1(a) GET(y),DEO(a, y))
117+ /* ADD */ OPC(0x18, POx(a) POx(b),PUx(b + a))
118+ /* SUB */ OPC(0x19, POx(a) POx(b),PUx(b - a))
119+ /* MUL */ OPC(0x1a, POx(a) POx(b),PUx(b * a))
120+ /* DIV */ OPC(0x1b, POx(a) POx(b),PUx(a ? b / a : 0))
121+ /* AND */ OPC(0x1c, POx(a) POx(b),PUx(b & a))
122+ /* ORA */ OPC(0x1d, POx(a) POx(b),PUx(b | a))
123+ /* EOR */ OPC(0x1e, POx(a) POx(b),PUx(b ^ a))
124+ /* SFT */ OPC(0x1f, PO1(a) POx(b),PUx(b >> (a & 0xf) << (a >> 4)))
125 }
126 }
127 }