Dariaceli's Git
Browse code

(uxn.c) Removed offset in PUT()

neauoire authored on 10/08/2023 02:43:28
Showing 1 changed files
src/uxn.c
History View file @ 015072f
... ... 
@@ -25,11 +25,11 @@ WITH REGARD TO THIS SOFTWARE.
25 25 
 #define N2 PEEK2((ptr-3))
26 26 
 #define L2 PEEK2((ptr-5))
27 27
28 
-#define HALT(c)    { return emu_halt(u, ins, c, pc - 1); }
29 
-#define FLIP       { s = ins & 0x40 ? &u->wst : &u->rst; }
30 
-#define SET(x, y)  { r = s->ptr; if(x > r) HALT(1) r += (x & k) + y; if(r > 254) HALT(2) ptr = s->dat + r - 1; s->ptr = r; }
31 
-#define PUT1(o, v) { *(ptr - o) = v; }
32 
-#define PUT2(o, v) { r = (v); *(ptr - o) = r; *(ptr - o - 1) = r >> 8; }
28 
+#define HALT(c)   { return emu_halt(u, ins, c, pc - 1); }
29 
+#define FLIP      { s = ins & 0x40 ? &u->wst : &u->rst; }
30 
+#define SET(x, y) { r = s->ptr; if(x > r) HALT(1) r += (x & k) + y; if(r > 254) HALT(2) ptr = s->dat + r - 1; s->ptr = r; }
31 
+#define PUT1(v)   { *(ptr--) = v; }
32 
+#define PUT2(v)   { r = (v); *(ptr--) = r; *(ptr--) = r >> 8; }
33 33
34 34 
 int
35 35 
 uxn_eval(Uxn *u, Uint16 pc)
... ... 
@@ -48,72 +48,72 @@ uxn_eval(Uxn *u, Uint16 pc)
48 48 
 			case 0x00: /* BRK   */                          return 1;
49 49 
 			case 0xff: /* JCI   */                          if(!s->dat[--s->ptr]) { pc += 2; break; }
50 50 
 			case 0xfe: /* JMI   */                          pc += PEEK2(ram + pc) + 2; break;
51 
-			case 0xfd: /* JSI   */                SET(0, 2) PUT2(0, pc + 2) pc += PEEK2(ram + pc) + 2; break;
52 
-			case 0xfc: /* LITr */ case 0xfa:      SET(0, 1) PUT1(0, ram[pc++]) break;
53 
-			case 0xfb: /* LIT2r*/ case 0xf9:      SET(0, 2) PUT2(0, PEEK2(ram + pc)) pc += 2; break;
51 
+			case 0xfd: /* JSI   */                SET(0, 2) PUT2(pc + 2) pc += PEEK2(ram + pc) + 2; break;
52 
+			case 0xfc: /* LITr */ case 0xfa:      SET(0, 1) PUT1(ram[pc++]) break;
53 
+			case 0xfb: /* LIT2r*/ case 0xf9:      SET(0, 2) PUT2(PEEK2(ram + pc)) pc += 2; break;
54 54 
 			/* ALU */
55 
-			case 0x01: /* INC  */ t=T;            SET(1, 0) PUT1(0, t + 1) break;
56 
-			case 0x21: /* INC2 */ t=T2;           SET(2, 0) PUT2(0, t + 1) break;
55 
+			case 0x01: /* INC  */ t=T;            SET(1, 0) PUT1(t + 1) break;
56 
+			case 0x21: /* INC2 */ t=T2;           SET(2, 0) PUT2(t + 1) break;
57 57 
 			case 0x02: /* POP  */                 SET(1,-1) break;
58 58 
 			case 0x22: /* POP2 */                 SET(2,-2) break;
59 
-			case 0x03: /* NIP  */ t=T;            SET(2,-1) PUT1(0, t) break;
60 
-			case 0x23: /* NIP2 */ t=T2;           SET(4,-2) PUT2(0, t) break;
61 
-			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) PUT1(0, n) PUT1(1, t) break;
62 
-			case 0x24: /* SWP2 */ t=T2;n=N2;      SET(4, 0) PUT2(0, n) PUT2(2, t) break;
63 
-			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) PUT1(0, l) PUT1(1, t) PUT1(2, n) break;
64 
-			case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
65 
-			case 0x06: /* DUP  */ t=T;            SET(1, 1) PUT1(0, t) PUT1(1, t) break;
66 
-			case 0x26: /* DUP2 */ t=T2;           SET(2, 2) PUT2(0, t) PUT2(2, t) break;
67 
-			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) PUT1(0, n) PUT1(1, t) PUT1(2, n) break;
68 
-			case 0x27: /* OVR2 */ t=T2;n=N2;      SET(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
69 
-			case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) PUT1(0, n == t) break;
70 
-			case 0x28: /* EQU2 */ t=T2;n=N2;      SET(4,-3) PUT1(0, n == t) break;
71 
-			case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) PUT1(0, n != t) break;
72 
-			case 0x29: /* NEQ2 */ t=T2;n=N2;      SET(4,-3) PUT1(0, n != t) break;
73 
-			case 0x0a: /* GTH  */ t=T;n=N;        SET(2,-1) PUT1(0, n > t) break;
74 
-			case 0x2a: /* GTH2 */ t=T2;n=N2;      SET(4,-3) PUT1(0, n > t) break;
75 
-			case 0x0b: /* LTH  */ t=T;n=N;        SET(2,-1) PUT1(0, n < t) break;
76 
-			case 0x2b: /* LTH2 */ t=T2;n=N2;      SET(4,-3) PUT1(0, n < t) break;
59 
+			case 0x03: /* NIP  */ t=T;            SET(2,-1) PUT1(t) break;
60 
+			case 0x23: /* NIP2 */ t=T2;           SET(4,-2) PUT2(t) break;
61 
+			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) PUT1(n) PUT1(t) break;
62 
+			case 0x24: /* SWP2 */ t=T2;n=N2;      SET(4, 0) PUT2(n) PUT2(t) break;
63 
+			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) PUT1(l) PUT1(t) PUT1(n) break;
64 
+			case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) PUT2(l) PUT2(t) PUT2(n) break;
65 
+			case 0x06: /* DUP  */ t=T;            SET(1, 1) PUT1(t) PUT1(t) break;
66 
+			case 0x26: /* DUP2 */ t=T2;           SET(2, 2) PUT2(t) PUT2(t) break;
67 
+			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) PUT1(n) PUT1(t) PUT1(n) break;
68 
+			case 0x27: /* OVR2 */ t=T2;n=N2;      SET(4, 2) PUT2(n) PUT2(t) PUT2(n) break;
69 
+			case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) PUT1(n == t) break;
70 
+			case 0x28: /* EQU2 */ t=T2;n=N2;      SET(4,-3) PUT1(n == t) break;
71 
+			case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) PUT1(n != t) break;
72 
+			case 0x29: /* NEQ2 */ t=T2;n=N2;      SET(4,-3) PUT1(n != t) break;
73 
+			case 0x0a: /* GTH  */ t=T;n=N;        SET(2,-1) PUT1(n > t) break;
74 
+			case 0x2a: /* GTH2 */ t=T2;n=N2;      SET(4,-3) PUT1(n > t) break;
75 
+			case 0x0b: /* LTH  */ t=T;n=N;        SET(2,-1) PUT1(n < t) break;
76 
+			case 0x2b: /* LTH2 */ t=T2;n=N2;      SET(4,-3) PUT1(n < t) break;
77 77 
 			case 0x0c: /* JMP  */ t=T;            SET(1,-1) pc += (Sint8)t; break;
78 78 
 			case 0x2c: /* JMP2 */ t=T2;           SET(2,-2) pc = t; break;
79 79 
 			case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) if(n) pc += (Sint8)t; break;
80 80 
 			case 0x2d: /* JCN2 */ t=T2;n=L;       SET(3,-3) if(n) pc = t; break;
81 
-			case 0x0e: /* JSR  */ t=T;            SET(1,-1) FLIP SET(0,2) PUT2(0, pc) pc += (Sint8)t; break;
82 
-			case 0x2e: /* JSR2 */ t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(0, pc) pc = t; break;
83 
-			case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SET(0,1) PUT1(0, t) break;
84 
-			case 0x2f: /* STH2 */ t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(0, t) break;
85 
-			case 0x10: /* LDZ  */ t=T;            SET(1, 0) PUT1(0, ram[t]) break;
86 
-			case 0x30: /* LDZ2 */ t=T;            SET(1, 1) PUT2(0, PEEK2(ram + t)) break;
81 
+			case 0x0e: /* JSR  */ t=T;            SET(1,-1) FLIP SET(0,2) PUT2(pc) pc += (Sint8)t; break;
82 
+			case 0x2e: /* JSR2 */ t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(pc) pc = t; break;
83 
+			case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SET(0,1) PUT1(t) break;
84 
+			case 0x2f: /* STH2 */ t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(t) break;
85 
+			case 0x10: /* LDZ  */ t=T;            SET(1, 0) PUT1(ram[t]) break;
86 
+			case 0x30: /* LDZ2 */ t=T;            SET(1, 1) PUT2(PEEK2(ram + t)) break;
87 87 
 			case 0x11: /* STZ  */ t=T;n=N;        SET(2,-2) ram[t] = n; break;
88 88 
 			case 0x31: /* STZ2 */ t=T;n=H2;       SET(3,-3) POKE2(ram + t, n) break;
89 
-			case 0x12: /* LDR  */ t=T;            SET(1, 0) PUT1(0, ram[pc + (Sint8)t]) break;
90 
-			case 0x32: /* LDR2 */ t=T;            SET(1, 1) PUT2(0, PEEK2(ram + pc + (Sint8)t)) break;
89 
+			case 0x12: /* LDR  */ t=T;            SET(1, 0) PUT1(ram[pc + (Sint8)t]) break;
90 
+			case 0x32: /* LDR2 */ t=T;            SET(1, 1) PUT2(PEEK2(ram + pc + (Sint8)t)) break;
91 91 
 			case 0x13: /* STR  */ t=T;n=N;        SET(2,-2) ram[pc + (Sint8)t] = n; break;
92 92 
 			case 0x33: /* STR2 */ t=T;n=H2;       SET(3,-3) POKE2(ram + pc + (Sint8)t, n) break;
93 
-			case 0x14: /* LDA  */ t=T2;           SET(2,-1) PUT1(0, ram[t]) break;
94 
-			case 0x34: /* LDA2 */ t=T2;           SET(2, 0) PUT2(0, PEEK2(ram + t)) break;
93 
+			case 0x14: /* LDA  */ t=T2;           SET(2,-1) PUT1(ram[t]) break;
94 
+			case 0x34: /* LDA2 */ t=T2;           SET(2, 0) PUT2(PEEK2(ram + t)) break;
95 95 
 			case 0x15: /* STA  */ t=T2;n=L;       SET(3,-3) ram[t] = n; break;
96 96 
 			case 0x35: /* STA2 */ t=T2;n=N2;      SET(4,-4) POKE2(ram + t, n) break;
97 
-			case 0x16: /* DEI  */ t=T;            SET(1, 0) PUT1(0, DEI(t)) break;
98 
-			case 0x36: /* DEI2 */ t=T;            SET(1, 1) PUT1(0, DEI(t + 1)) PUT1(1, DEI(t)) break;
97 
+			case 0x16: /* DEI  */ t=T;            SET(1, 0) PUT1(DEI(t)) break;
98 
+			case 0x36: /* DEI2 */ t=T;            SET(1, 1) PUT1(DEI(t + 1)) PUT1(DEI(t)) break;
99 99 
 			case 0x17: /* DEO  */ t=T;n=N;        SET(2,-2) DEO(t, n) break;
100 100 
 			case 0x37: /* DEO2 */ t=T;n=N;l=L;    SET(3,-3) DEO(t, l) DEO((t + 1), n) break;
101 
-			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) PUT1(0, n + t) break;
102 
-			case 0x38: /* ADD2 */ t=T2;n=N2;      SET(4,-2) PUT2(0, n + t) break;
103 
-			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) PUT1(0, n - t) break;
104 
-			case 0x39: /* SUB2 */ t=T2;n=N2;      SET(4,-2) PUT2(0, n - t) break;
105 
-			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) PUT1(0, n * t) break;
106 
-			case 0x3a: /* MUL2 */ t=T2;n=N2;      SET(4,-2) PUT2(0, n * t) break;
107 
-			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) if(!t) HALT(3) PUT1(0, n / t) break;
108 
-			case 0x3b: /* DIV2 */ t=T2;n=N2;      SET(4,-2) if(!t) HALT(3) PUT2(0, n / t) break;
109 
-			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) PUT1(0, n & t) break;
110 
-			case 0x3c: /* AND2 */ t=T2;n=N2;      SET(4,-2) PUT2(0, n & t) break;
111 
-			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) PUT1(0, n | t) break;
112 
-			case 0x3d: /* ORA2 */ t=T2;n=N2;      SET(4,-2) PUT2(0, n | t) break;
113 
-			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) PUT1(0, n ^ t) break;
114 
-			case 0x3e: /* EOR2 */ t=T2;n=N2;      SET(4,-2) PUT2(0, n ^ t) break;
115 
-			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) PUT1(0, n >> (t & 0xf) << (t >> 4)) break;
116 
-			case 0x3f: /* SFT2 */ t=T;n=H2;       SET(3,-1) PUT2(0, n >> (t & 0xf) << (t >> 4)) break;
101 
+			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) PUT1(n + t) break;
102 
+			case 0x38: /* ADD2 */ t=T2;n=N2;      SET(4,-2) PUT2(n + t) break;
103 
+			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) PUT1(n - t) break;
104 
+			case 0x39: /* SUB2 */ t=T2;n=N2;      SET(4,-2) PUT2(n - t) break;
105 
+			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) PUT1(n * t) break;
106 
+			case 0x3a: /* MUL2 */ t=T2;n=N2;      SET(4,-2) PUT2(n * t) break;
107 
+			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) if(!t) HALT(3) PUT1(n / t) break;
108 
+			case 0x3b: /* DIV2 */ t=T2;n=N2;      SET(4,-2) if(!t) HALT(3) PUT2(n / t) break;
109 
+			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) PUT1(n & t) break;
110 
+			case 0x3c: /* AND2 */ t=T2;n=N2;      SET(4,-2) PUT2(n & t) break;
111 
+			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) PUT1(n | t) break;
112 
+			case 0x3d: /* ORA2 */ t=T2;n=N2;      SET(4,-2) PUT2(n | t) break;
113 
+			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) PUT1(n ^ t) break;
114 
+			case 0x3e: /* EOR2 */ t=T2;n=N2;      SET(4,-2) PUT2(n ^ t) break;
115 
+			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) PUT1(n >> (t & 0xf) << (t >> 4)) break;
116 
+			case 0x3f: /* SFT2 */ t=T;n=H2;       SET(3,-1) PUT2(n >> (t & 0xf) << (t >> 4)) break;
117 117 
 		}
118 118 
 	}
119 119 
 }