Dariaceli's Git
Browse code

(uxn-fast) Housekeeping

Devine Lu Linvega authored on 04/03/2023 04:47:20
Showing 1 changed files
src/uxn-fast.c
History View file @ 9ac7f06
... ... 
@@ -38,22 +38,8 @@ WITH REGARD TO THIS SOFTWARE.
38 38
39 39 
 static
40 40 
 Uint16 callbacks[] = {
41 
-        0xffff, /* 00 system */
42 
-        0xffff, /* 10 console */
43 
-        0xc028, /* 20 screen */
44 
-        0x8000, /* 30 audio 0 */
45 
-        0x8000, /* 40 audio 1 */
46 
-        0x8000, /* 50 audio 2 */
47 
-        0x8000, /* 60 audio 3 */
48 
-        0x0000, /* 70 midi */
49 
-        0x0000, /* 80 mouse */
50 
-        0x0000, /* 90 controller*/
51 
-        0xa260, /* a0 file 0 */
52 
-        0xa260, /* b0 file 1 */
53 
-        0xffff, /* c0 datetime */
54 
-        0x0000, /* d0 empty */
55 
-        0x0000, /* e0 empty */
56 
-        0x0000  /* f0 empty */
41 
+	0x6a08, 0x0300, 0xc028, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000,
42 
+	0x0000, 0x0000, 0xa260, 0xa260, 0x0000, 0x0000, 0x0000, 0x0000
57 43 
 };
58 44
59 45 
 int
... ... 
@@ -79,65 +65,65 @@ uxn_eval(Uxn *u, Uint16 pc)
79 65 
 			case 0xfa: /* LITr  */ PUSH(u->rst, u->ram[pc++]); break;
80 66 
 			case 0xf9: /* LIT2r */ PUSH2(u->rst, PEEK16(u->ram + pc)); pc += 2; break;
81 67 
 			/* ALU */
82 
-			case 0x21: /* INC2 */ t=T2;           INC(2, 0) PUT2(0, t + 1) break;
83 
-			case 0x01: /* INC  */ t=T;            INC(1, 0) PUT(0, t + 1); break;
84 
-			case 0x22: /* POP2 */                 DEC(2, 0) break;
85 
-			case 0x02: /* POP  */                 DEC(1, 0) break;
86 
-			case 0x23: /* NIP2 */ t=T2;           DEC(2, 0) PUT2(0, t) break;
87 
-			case 0x03: /* NIP  */ t=T;            DEC(1, 0) PUT(0, t) break;
88 
-			case 0x24: /* SWP2 */ t=T2;n=N2;      INC(4, 0) PUT2(2, t) PUT2(0, n); break;
89 
-			case 0x04: /* SWP  */ t=T;n=N;        INC(2, 0) PUT(0, n) PUT(1, t); break;
90 
-			case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; INC(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
91 
-			case 0x05: /* ROT  */ t=T;n=N;l=L;    INC(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break;
92 
-			case 0x26: /* DUP2 */ t=T2;           INC(2, 2) PUT2(0, t) PUT2(2, t) break;
93 
-			case 0x06: /* DUP  */ t=T;            INC(1, 1) PUT(0, t) PUT(1, t) break;
94 
-			case 0x27: /* OVR2 */ t=T2;n=N2;      INC(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
95 
-			case 0x07: /* OVR  */ t=T;n=N;        INC(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break;
96 
-			case 0x28: /* EQU2 */ t=T2;n=N2;      INC(4,-3) PUT(0, n == t) break;
97 
-			case 0x08: /* EQU  */ t=T;n=N;        INC(2,-1) PUT(0, n == t) break;
98 
-			case 0x29: /* NEQ2 */ t=T2;n=N2;      INC(4,-3) PUT(0, n != t) break;
99 
-			case 0x09: /* NEQ  */ t=T;n=N;        INC(2,-1) PUT(0, n != t) break;
100 
-			case 0x2a: /* GTH2 */ t=T2;n=N2;      INC(4,-3) PUT(0, n > t)  break;
101 
-			case 0x0a: /* GTH  */ t=T;n=N;        INC(2,-1) PUT(0, n > t) break;
102 
-			case 0x2b: /* LTH2 */ t=T2;n=N2;      INC(4,-3) PUT(0, n < t)  break;
103 
-			case 0x0b: /* LTH  */ t=T;n=N;        INC(2,-1) PUT(0, n < t) break;
104 
-			case 0x2c: /* JMP2 */ t=T2;           DEC(2, 0) pc = t; break;
105 
-			case 0x0c: /* JMP  */ t=T;            DEC(1, 0) pc += (Sint8)(t);  break;
106 
-			case 0x2d: /* JCN2 */ t=T2;n=L;       DEC(3, 0) if(n) { pc = t; } break;
107 
-			case 0x0d: /* JCN  */ t=T;n=N;        DEC(2, 0) pc += !!n * (Sint8)t; break;
108 
-			case 0x2e: /* JSR2 */ t=T2;           DEC(2, 0) PUSH2(u->rst, pc) pc = t; break;
68 
+			case 0x21: /* INC2 */ t=T2;           INC(2, 0) PUT2(0, t + 1) break;
69 
+			case 0x01: /* INC  */ t=T;            INC(1, 0) PUT(0, t + 1); break;
70 
+			case 0x22: /* POP2 */                 DEC(2, 0) break;
71 
+			case 0x02: /* POP  */                 DEC(1, 0) break;
72 
+			case 0x23: /* NIP2 */ t=T2;           DEC(2, 0) PUT2(0, t) break;
73 
+			case 0x03: /* NIP  */ t=T;            DEC(1, 0) PUT(0, t) break;
74 
+			case 0x24: /* SWP2 */ t=T2;n=N2;      INC(4, 0) PUT2(2, t) PUT2(0, n); break;
75 
+			case 0x04: /* SWP  */ t=T;n=N;        INC(2, 0) PUT(0, n) PUT(1, t); break;
76 
+			case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; INC(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
77 
+			case 0x05: /* ROT  */ t=T;n=N;l=L;    INC(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break;
78 
+			case 0x26: /* DUP2 */ t=T2;           INC(2, 2) PUT2(0, t) PUT2(2, t) break;
79 
+			case 0x06: /* DUP  */ t=T;            INC(1, 1) PUT(0, t) PUT(1, t) break;
80 
+			case 0x27: /* OVR2 */ t=T2;n=N2;      INC(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
81 
+			case 0x07: /* OVR  */ t=T;n=N;        INC(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break;
82 
+			case 0x28: /* EQU2 */ t=T2;n=N2;      INC(4,-3) PUT(0, n == t) break;
83 
+			case 0x08: /* EQU  */ t=T;n=N;        INC(2,-1) PUT(0, n == t) break;
84 
+			case 0x29: /* NEQ2 */ t=T2;n=N2;      INC(4,-3) PUT(0, n != t) break;
85 
+			case 0x09: /* NEQ  */ t=T;n=N;        INC(2,-1) PUT(0, n != t) break;
86 
+			case 0x2a: /* GTH2 */ t=T2;n=N2;      INC(4,-3) PUT(0, n > t)  break;
87 
+			case 0x0a: /* GTH  */ t=T;n=N;        INC(2,-1) PUT(0, n > t) break;
88 
+			case 0x2b: /* LTH2 */ t=T2;n=N2;      INC(4,-3) PUT(0, n < t)  break;
89 
+			case 0x0b: /* LTH  */ t=T;n=N;        INC(2,-1) PUT(0, n < t) break;
90 
+			case 0x2c: /* JMP2 */ t=T2;           DEC(2, 0) pc = t; break;
91 
+			case 0x0c: /* JMP  */ t=T;            DEC(1, 0) pc += (Sint8)t;  break;
92 
+			case 0x2d: /* JCN2 */ t=T2;n=L;       DEC(3, 0) if(n) { pc = t; } break;
93 
+			case 0x0d: /* JCN  */ t=T;n=N;        DEC(2, 0) pc += !!n * (Sint8)t; break;
94 
+			case 0x2e: /* JSR2 */ t=T2;           DEC(2, 0) PUSH2(u->rst, pc) pc = t; break;
109 95 
 			case 0x0e: /* JSR  */ t=T;            DEC(1, 0) PUSH2(u->rst, pc) pc += (Sint8)t; break;
110 
-			case 0x2f: /* STH2 */ t=T2; if(ins & 0x40) { u->rst->ptr -= !k * 2; PUSH2(u->wst, t); } else{ u->wst->ptr -= !k * 2; PUSH2(u->rst, t); } break;
111 
-			case 0x0f: /* STH  */ t=T;  if(ins & 0x40) { u->rst->ptr -= !k; PUSH(u->wst, t); } else{ u->wst->ptr -= !k; PUSH(u->rst, t); } break;
112 
-			case 0x30: /* LDZ2 */ t=T;            INC(1, 1) PUT2(0, PEEK16(u->ram + t)) break;
113 
-			case 0x10: /* LDZ  */ t=T;            INC(1, 0) PUT(0, u->ram[t]) break;
114 
-			case 0x31: /* STZ2 */ t=T;n=H2;       DEC(3, 0) POKE16(u->ram + t, n) break;
115 
-			case 0x11: /* STZ  */ t=T;n=N;        DEC(2, 0) u->ram[t] = n; break;
116 
-			case 0x32: /* LDR2 */ t=T;            INC(1, 1) PUT2(0, PEEK16(u->ram + pc + (Sint8)t)) break;
96 
+			case 0x2f: /* STH2 */ t=T2; if(ins & 0x40) { u->rst->ptr -= !k * 2; PUSH2(u->wst, t); } else{ u->wst->ptr -= !k * 2; PUSH2(u->rst, t); } break;
97 
+			case 0x0f: /* STH  */ t=T;  if(ins & 0x40) { u->rst->ptr -= !k; PUSH(u->wst, t); } else{ u->wst->ptr -= !k; PUSH(u->rst, t); } break;
98 
+			case 0x30: /* LDZ2 */ t=T;            INC(1, 1) PUT2(0, PEEK16(u->ram + t)) break;
99 
+			case 0x10: /* LDZ  */ t=T;            INC(1, 0) PUT(0, u->ram[t]) break;
100 
+			case 0x31: /* STZ2 */ t=T;n=H2;       DEC(3, 0) POKE16(u->ram + t, n) break;
101 
+			case 0x11: /* STZ  */ t=T;n=N;        DEC(2, 0) u->ram[t] = n; break;
102 
+			case 0x32: /* LDR2 */ t=T;            INC(1, 1) PUT2(0, PEEK16(u->ram + pc + (Sint8)t)) break;
117 103 
 			case 0x12: /* LDR  */ t=T;            INC(1, 0) PUT(0, u->ram[pc + (Sint8)t]) break;
118 
-			case 0x33: /* STR2 */ t=T;n=H2;       DEC(3, 0) POKE16(u->ram + pc + (Sint8)t, n) break;
119 
-			case 0x13: /* STR  */ t=T;n=N;        DEC(2, 0) u->ram[pc + (Sint8)t] = n; break;
120 
-			case 0x34: /* LDA2 */ t=T2;           INC(2, 0) PUT2(0, PEEK16(u->ram + t)) break;
104 
+			case 0x33: /* STR2 */ t=T;n=H2;       DEC(3, 0) POKE16(u->ram + pc + (Sint8)t, n) break;
105 
+			case 0x13: /* STR  */ t=T;n=N;        DEC(2, 0) u->ram[pc + (Sint8)t] = n; break;
106 
+			case 0x34: /* LDA2 */ t=T2;           INC(2, 0) PUT2(0, PEEK16(u->ram + t)) break;
121 107 
 			case 0x14: /* LDA  */ t=T2;           INC(2,-1) PUT(0, u->ram[t]) break;
122 
-			case 0x35: /* STA2 */ t=T2;n=N2;      DEC(4, 0) POKE16(u->ram + t, n) break;
123 
-			case 0x15: /* STA  */ t=T2;n=L;       DEC(3, 0) u->ram[t] = n; break;
124 
-			case 0x36: /* DEI2 */ t=T;            INC(1, 1) PUT(1, u->dei(u, t)) PUT(0, u->dei(u, t + 1)) break;
108 
+			case 0x35: /* STA2 */ t=T2;n=N2;      DEC(4, 0) POKE16(u->ram + t, n) break;
109 
+			case 0x15: /* STA  */ t=T2;n=L;       DEC(3, 0) u->ram[t] = n; break;
110 
+			case 0x36: /* DEI2 */ t=T;            INC(1, 1) PUT(1, u->dei(u, t)) PUT(0, u->dei(u, t + 1)) break;
125 111 
 			case 0x16: /* DEI  */ t=T;            INC(1, 0) PUT(0, u->dei(u, t)) break;
126 
-			case 0x37: /* DEO2 */ t=T;n=N;l=L;    DEC(3, 0) SEND(t, l) SEND(t + 1, n) break;
127 
-			case 0x17: /* DEO  */ t=T;n=N;        DEC(2, 0) SEND(t, n) break;
128 
-			case 0x38: /* ADD2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n + t) break;
112 
+			case 0x37: /* DEO2 */ t=T;n=N;l=L;    DEC(3, 0) SEND(t, l) SEND(t + 1, n) break;
113 
+			case 0x17: /* DEO  */ t=T;n=N;        DEC(2, 0) SEND(t, n) break;
114 
+			case 0x38: /* ADD2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n + t) break;
129 115 
 			case 0x18: /* ADD  */ t=T;n=N;        INC(2,-1) PUT(0, n + t) break;
130 
-			case 0x39: /* SUB2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n - t) break;
116 
+			case 0x39: /* SUB2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n - t) break;
131 117 
 			case 0x19: /* SUB  */ t=T;n=N;        INC(2,-1) PUT(0, n - t) break;
132 
-			case 0x3a: /* MUL2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n * t) break;
118 
+			case 0x3a: /* MUL2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n * t) break;
133 119 
 			case 0x1a: /* MUL  */ t=T;n=N;        INC(2,-1) PUT(0, n * t) break;
134 
-			case 0x3b: /* DIV2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n / t) break;
120 
+			case 0x3b: /* DIV2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n / t) break;
135 121 
 			case 0x1b: /* DIV  */ t=T;n=N;        INC(2,-1) PUT(0, n / t) break;
136 
-			case 0x3c: /* AND2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n & t) break;
122 
+			case 0x3c: /* AND2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n & t) break;
137 123 
 			case 0x1c: /* AND  */ t=T;n=N;        INC(2,-1) PUT(0, n & t) break;
138 
-			case 0x3d: /* ORA2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n | t) break;
124 
+			case 0x3d: /* ORA2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n | t) break;
139 125 
 			case 0x1d: /* ORA  */ t=T;n=N;        INC(2,-1) PUT(0, n | t) break;
140 
-			case 0x3e: /* EOR2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n ^ t) break;
126 
+			case 0x3e: /* EOR2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n ^ t) break;
141 127 
 			case 0x1e: /* EOR  */ t=T;n=N;        INC(2,-1) PUT(0, n ^ t) break;
142 128 
 			case 0x3f: /* SFT2 */ t=T;n=H2;       INC(3,-1) PUT2(0, n >> (t & 0x0f) << ((t & 0xf0) >> 4)) break;
143 129 
 			case 0x1f: /* SFT  */ t=T;n=N;        INC(2,-1) PUT(0, n >> (t & 0x0f) << ((t & 0xf0) >> 4)) break;