Dariaceli's Git
Browse code

Removed redundant macros

neauoire authored on 30/08/2023 17:16:38
Showing 2 changed files
src/uxn.c
History View file @ e5617f8
... ... 
@@ -28,12 +28,9 @@ WITH REGARD TO THIS SOFTWARE.
28 28 
 #define HALT(c)         { return emu_halt(u, ins, c, pc - 1); }
29 29 
 #define FLIP            { s = ins & 0x40 ? &u->wst : &u->rst; }
30 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(a)         { *ptr = a; }
32 
-#define PUT1x2(a, b)    { *ptr = a; *(ptr - 1) = b; }
33 
-#define PUT1x3(a, b, c) { *ptr = a; *(ptr - 1) = b; *(ptr - 2) = c; }
34 
-#define PUT2(a)         { r = (a); POKE2(ptr - 1, r) }
35 
-#define PUT2x2(a, b)    { POKE2(ptr - 1, a) POKE2(ptr - 3, b) }
36 
-#define PUT2x3(a, b, c) { POKE2(ptr - 1, a) POKE2(ptr - 3, b) POKE2(ptr - 5, c) }
31 
+#define PUT2(a)         { r = (a); POKE2c(rr, ptr - 1, r) }
32 
+#define PUT2x2(a, b)    { POKE2c(rr, ptr - 1, a) POKE2c(rr, ptr - 3, b) }
33 
+#define PUT2x3(a, b, c) { POKE2c(rr, ptr - 1, a) POKE2c(rr, ptr - 3, b) POKE2c(rr, ptr - 5, c) }
37 34
38 35 
 int
39 36 
 uxn_eval(Uxn *u, Uint16 pc)
... ... 
@@ -52,70 +49,70 @@ uxn_eval(Uxn *u, Uint16 pc)
52 49 
 			case 0x200: /* JCI  */ t=T;           SET(0,-1) if(!t) { pc += 2; break; } /* else fallthrough */
53 50 
 			case 0x400: /* JMI  */                          pc += PEEK2(ram + pc) + 2; break;
54 51 
 			case 0x600: /* JSI  */                SET(0, 2) PUT2(pc + 2) pc += PEEK2(ram + pc) + 2; break;
55 
-			case 0x800: /* LIT  */ case 0xc00:    SET(0, 1) PUT1(ram[pc++]) break;
52 
+			case 0x800: /* LIT  */ case 0xc00:    SET(0, 1) T = ram[pc++]; break;
56 53 
 			case 0xa00: /* LIT2 */ case 0xe00:    SET(0, 2) PUT2(PEEK2(ram + pc)) pc += 2; break;
57 54 
 			/* ALU */
58 
-			case 0x01: /* INC  */ t=T;            SET(1, 0) PUT1(t + 1) break;
55 
+			case 0x01: /* INC  */ t=T;            SET(1, 0) T = t + 1; break;
59 56 
 			case 0x21: /* INC2 */ t=T2;           SET(2, 0) PUT2(t + 1) break;
60 57 
 			case 0x02: /* POP  */                 SET(1,-1) break;
61 58 
 			case 0x22: /* POP2 */                 SET(2,-2) break;
62 
-			case 0x03: /* NIP  */ t=T;            SET(2,-1) PUT1(t) break;
59 
+			case 0x03: /* NIP  */ t=T;            SET(2,-1) T = t; break;
63 60 
 			case 0x23: /* NIP2 */ t=T2;           SET(4,-2) PUT2(t) break;
64 
-			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) PUT1x2(n, t) break;
61 
+			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) T = n; N = t; break;
65 62 
 			case 0x24: /* SWP2 */ t=T2;n=N2;      SET(4, 0) PUT2x2(n, t) break;
66 
-			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) PUT1x3(l, t, n) break;
63 
+			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) T = l; N = t; L = n; break;
67 64 
 			case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) PUT2x3(l, t, n) break;
68 
-			case 0x06: /* DUP  */ t=T;            SET(1, 1) PUT1x2(t, t) break;
65 
+			case 0x06: /* DUP  */ t=T;            SET(1, 1) T = t; N = t; break;
69 66 
 			case 0x26: /* DUP2 */ t=T2;           SET(2, 2) PUT2x2(t, t) break;
70 
-			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) PUT1x3(n, t, n) break;
67 
+			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) T = n; N = t; L = n; break;
71 68 
 			case 0x27: /* OVR2 */ t=T2;n=N2;      SET(4, 2) PUT2x3(n, t, n) break;
72 
-			case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) PUT1(n == t) break;
73 
-			case 0x28: /* EQU2 */ t=T2;n=N2;      SET(4,-3) PUT1(n == t) break;
74 
-			case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) PUT1(n != t) break;
75 
-			case 0x29: /* NEQ2 */ t=T2;n=N2;      SET(4,-3) PUT1(n != t) break;
76 
-			case 0x0a: /* GTH  */ t=T;n=N;        SET(2,-1) PUT1(n > t) break;
77 
-			case 0x2a: /* GTH2 */ t=T2;n=N2;      SET(4,-3) PUT1(n > t) break;
78 
-			case 0x0b: /* LTH  */ t=T;n=N;        SET(2,-1) PUT1(n < t) break;
79 
-			case 0x2b: /* LTH2 */ t=T2;n=N2;      SET(4,-3) PUT1(n < t) break;
69 
+			case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) T = n == t; break;
70 
+			case 0x28: /* EQU2 */ t=T2;n=N2;      SET(4,-3) T = n == t; break;
71 
+			case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) T = n != t; break;
72 
+			case 0x29: /* NEQ2 */ t=T2;n=N2;      SET(4,-3) T = n != t; break;
73 
+			case 0x0a: /* GTH  */ t=T;n=N;        SET(2,-1) T = n > t; break;
74 
+			case 0x2a: /* GTH2 */ t=T2;n=N2;      SET(4,-3) T = n > t; break;
75 
+			case 0x0b: /* LTH  */ t=T;n=N;        SET(2,-1) T = n < t; break;
76 
+			case 0x2b: /* LTH2 */ t=T2;n=N2;      SET(4,-3) T = n < t; break;
80 77 
 			case 0x0c: /* JMP  */ t=T;            SET(1,-1) pc += (Sint8)t; break;
81 78 
 			case 0x2c: /* JMP2 */ t=T2;           SET(2,-2) pc = t; break;
82 79 
 			case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) if(n) pc += (Sint8)t; break;
83 80 
 			case 0x2d: /* JCN2 */ t=T2;n=L;       SET(3,-3) if(n) pc = t; break;
84 81 
 			case 0x0e: /* JSR  */ t=T;            SET(1,-1) FLIP SET(0,2) PUT2(pc) pc += (Sint8)t; break;
85 82 
 			case 0x2e: /* JSR2 */ t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(pc) pc = t; break;
86 
-			case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SET(0,1) PUT1(t) break;
83 
+			case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SET(0,1) T = t; break;
87 84 
 			case 0x2f: /* STH2 */ t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(t) break;
88 
-			case 0x10: /* LDZ  */ t=T;            SET(1, 0) PUT1(ram[t]) break;
85 
+			case 0x10: /* LDZ  */ t=T;            SET(1, 0) T = ram[t]; break;
89 86 
 			case 0x30: /* LDZ2 */ t=T;            SET(1, 1) PUT2(PEEK2(ram + t)) break;
90 87 
 			case 0x11: /* STZ  */ t=T;n=N;        SET(2,-2) ram[t] = n; break;
91 88 
 			case 0x31: /* STZ2 */ t=T;n=H2;       SET(3,-3) rr = ram + t; POKE2(rr, n) break;
92 
-			case 0x12: /* LDR  */ t=T;            SET(1, 0) PUT1(ram[pc + (Sint8)t]) break;
89 
+			case 0x12: /* LDR  */ t=T;            SET(1, 0) T = ram[pc + (Sint8)t]; break;
93 90 
 			case 0x32: /* LDR2 */ t=T;            SET(1, 1) PUT2(PEEK2(ram + pc + (Sint8)t)) break;
94 91 
 			case 0x13: /* STR  */ t=T;n=N;        SET(2,-2) ram[pc + (Sint8)t] = n; break;
95 92 
 			case 0x33: /* STR2 */ t=T;n=H2;       SET(3,-3) rr = ram + pc + (Sint8)t; POKE2(rr, n) break;
96 
-			case 0x14: /* LDA  */ t=T2;           SET(2,-1) PUT1(ram[t]) break;
93 
+			case 0x14: /* LDA  */ t=T2;           SET(2,-1) T = ram[t]; break;
97 94 
 			case 0x34: /* LDA2 */ t=T2;           SET(2, 0) PUT2(PEEK2(ram + t)) break;
98 95 
 			case 0x15: /* STA  */ t=T2;n=L;       SET(3,-3) ram[t] = n; break;
99 96 
 			case 0x35: /* STA2 */ t=T2;n=N2;      SET(4,-4) rr = ram + t; POKE2(rr, n) break;
100 
-			case 0x16: /* DEI  */ t=T;            SET(1, 0) PUT1(DEI(t)) break;
101 
-			case 0x36: /* DEI2 */ t=T;            SET(1, 1) PUT1x2(DEI(t + 1), DEI(t)) break;
97 
+			case 0x16: /* DEI  */ t=T;            SET(1, 0) T = DEI(t); break;
98 
+			case 0x36: /* DEI2 */ t=T;            SET(1, 1) T = DEI(t + 1); N = DEI(t); break;
102 99 
 			case 0x17: /* DEO  */ t=T;n=N;        SET(2,-2) DEO(t, n) break;
103 100 
 			case 0x37: /* DEO2 */ t=T;n=N;l=L;    SET(3,-3) DEO(t, l) DEO((t + 1), n) break;
104 
-			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) PUT1(n + t) break;
101 
+			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) T = n + t; break;
105 102 
 			case 0x38: /* ADD2 */ t=T2;n=N2;      SET(4,-2) PUT2(n + t) break;
106 
-			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) PUT1(n - t) break;
103 
+			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) T = n - t; break;
107 104 
 			case 0x39: /* SUB2 */ t=T2;n=N2;      SET(4,-2) PUT2(n - t) break;
108 
-			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) PUT1(n * t) break;
105 
+			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) T = n * t; break;
109 106 
 			case 0x3a: /* MUL2 */ t=T2;n=N2;      SET(4,-2) PUT2(n * t) break;
110 
-			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) if(!t) HALT(3) PUT1(n / t) break;
107 
+			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) if(!t) HALT(3) T = n / t; break;
111 108 
 			case 0x3b: /* DIV2 */ t=T2;n=N2;      SET(4,-2) if(!t) HALT(3) PUT2(n / t) break;
112 
-			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) PUT1(n & t) break;
109 
+			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) T = n & t; break;
113 110 
 			case 0x3c: /* AND2 */ t=T2;n=N2;      SET(4,-2) PUT2(n & t) break;
114 
-			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) PUT1(n | t) break;
111 
+			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) T = n | t; break;
115 112 
 			case 0x3d: /* ORA2 */ t=T2;n=N2;      SET(4,-2) PUT2(n | t) break;
116 
-			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) PUT1(n ^ t) break;
113 
+			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) T = n ^ t; break;
117 114 
 			case 0x3e: /* EOR2 */ t=T2;n=N2;      SET(4,-2) PUT2(n ^ t) break;
118 
-			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) PUT1(n >> (t & 0xf) << (t >> 4)) break;
115 
+			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) T = n >> (t & 0xf) << (t >> 4); break;
119 116 
 			case 0x3f: /* SFT2 */ t=T;n=H2;       SET(3,-1) PUT2(n >> (t & 0xf) << (t >> 4)) break;
120 117 
 		}
121 118 
 	}
src/uxn.h
History View file @ e5617f8
... ... 
@@ -13,6 +13,7 @@ WITH REGARD TO THIS SOFTWARE.
13 13
14 14 
 #define PEEK2(d) (*(d) << 8 | (d)[1])
15 15 
 #define POKE2(d, v) { *(d) = (v) >> 8; (d)[1] = (v); }
16 
+#define POKE2c(cache, d, v) { cache = (d); POKE2(cache, v) }
16 17 
 #define DEI(p) (dei_masks[p] ? emu_dei(u, (p)) : u->dev[(p)])
17 18 
 #define DEO(p, v) { u->dev[p] = v; if(deo_masks[p]) emu_deo(u, p); }
18 19