commit e5617f83c927c73d58e3015babb22ee9763fcca4
parent aeb38c0819c0f5eeb4c5f2faed68ecff1e613e00
Author: neauoire <aliceffekt@gmail.com>
Date: Wed, 30 Aug 2023 10:16:38 -0700
Removed redundant macros
Diffstat:
| M | src/uxn.c | | | 67 | ++++++++++++++++++++++++++++++++----------------------------------- |
| M | src/uxn.h | | | 1 | + |
2 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/src/uxn.c b/src/uxn.c
@@ -28,12 +28,9 @@ WITH REGARD TO THIS SOFTWARE.
#define HALT(c) { return emu_halt(u, ins, c, pc - 1); }
#define FLIP { s = ins & 0x40 ? &u->wst : &u->rst; }
#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; }
-#define PUT1(a) { *ptr = a; }
-#define PUT1x2(a, b) { *ptr = a; *(ptr - 1) = b; }
-#define PUT1x3(a, b, c) { *ptr = a; *(ptr - 1) = b; *(ptr - 2) = c; }
-#define PUT2(a) { r = (a); POKE2(ptr - 1, r) }
-#define PUT2x2(a, b) { POKE2(ptr - 1, a) POKE2(ptr - 3, b) }
-#define PUT2x3(a, b, c) { POKE2(ptr - 1, a) POKE2(ptr - 3, b) POKE2(ptr - 5, c) }
+#define PUT2(a) { r = (a); POKE2c(rr, ptr - 1, r) }
+#define PUT2x2(a, b) { POKE2c(rr, ptr - 1, a) POKE2c(rr, ptr - 3, b) }
+#define PUT2x3(a, b, c) { POKE2c(rr, ptr - 1, a) POKE2c(rr, ptr - 3, b) POKE2c(rr, ptr - 5, c) }
int
uxn_eval(Uxn *u, Uint16 pc)
@@ -52,70 +49,70 @@ uxn_eval(Uxn *u, Uint16 pc)
case 0x200: /* JCI */ t=T; SET(0,-1) if(!t) { pc += 2; break; } /* else fallthrough */
case 0x400: /* JMI */ pc += PEEK2(ram + pc) + 2; break;
case 0x600: /* JSI */ SET(0, 2) PUT2(pc + 2) pc += PEEK2(ram + pc) + 2; break;
- case 0x800: /* LIT */ case 0xc00: SET(0, 1) PUT1(ram[pc++]) break;
+ case 0x800: /* LIT */ case 0xc00: SET(0, 1) T = ram[pc++]; break;
case 0xa00: /* LIT2 */ case 0xe00: SET(0, 2) PUT2(PEEK2(ram + pc)) pc += 2; break;
/* ALU */
- case 0x01: /* INC */ t=T; SET(1, 0) PUT1(t + 1) break;
+ case 0x01: /* INC */ t=T; SET(1, 0) T = t + 1; break;
case 0x21: /* INC2 */ t=T2; SET(2, 0) PUT2(t + 1) break;
case 0x02: /* POP */ SET(1,-1) break;
case 0x22: /* POP2 */ SET(2,-2) break;
- case 0x03: /* NIP */ t=T; SET(2,-1) PUT1(t) break;
+ case 0x03: /* NIP */ t=T; SET(2,-1) T = t; break;
case 0x23: /* NIP2 */ t=T2; SET(4,-2) PUT2(t) break;
- case 0x04: /* SWP */ t=T;n=N; SET(2, 0) PUT1x2(n, t) break;
+ case 0x04: /* SWP */ t=T;n=N; SET(2, 0) T = n; N = t; break;
case 0x24: /* SWP2 */ t=T2;n=N2; SET(4, 0) PUT2x2(n, t) break;
- case 0x05: /* ROT */ t=T;n=N;l=L; SET(3, 0) PUT1x3(l, t, n) break;
+ case 0x05: /* ROT */ t=T;n=N;l=L; SET(3, 0) T = l; N = t; L = n; break;
case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) PUT2x3(l, t, n) break;
- case 0x06: /* DUP */ t=T; SET(1, 1) PUT1x2(t, t) break;
+ case 0x06: /* DUP */ t=T; SET(1, 1) T = t; N = t; break;
case 0x26: /* DUP2 */ t=T2; SET(2, 2) PUT2x2(t, t) break;
- case 0x07: /* OVR */ t=T;n=N; SET(2, 1) PUT1x3(n, t, n) break;
+ case 0x07: /* OVR */ t=T;n=N; SET(2, 1) T = n; N = t; L = n; break;
case 0x27: /* OVR2 */ t=T2;n=N2; SET(4, 2) PUT2x3(n, t, n) break;
- case 0x08: /* EQU */ t=T;n=N; SET(2,-1) PUT1(n == t) break;
- case 0x28: /* EQU2 */ t=T2;n=N2; SET(4,-3) PUT1(n == t) break;
- case 0x09: /* NEQ */ t=T;n=N; SET(2,-1) PUT1(n != t) break;
- case 0x29: /* NEQ2 */ t=T2;n=N2; SET(4,-3) PUT1(n != t) break;
- case 0x0a: /* GTH */ t=T;n=N; SET(2,-1) PUT1(n > t) break;
- case 0x2a: /* GTH2 */ t=T2;n=N2; SET(4,-3) PUT1(n > t) break;
- case 0x0b: /* LTH */ t=T;n=N; SET(2,-1) PUT1(n < t) break;
- case 0x2b: /* LTH2 */ t=T2;n=N2; SET(4,-3) PUT1(n < t) break;
+ case 0x08: /* EQU */ t=T;n=N; SET(2,-1) T = n == t; break;
+ case 0x28: /* EQU2 */ t=T2;n=N2; SET(4,-3) T = n == t; break;
+ case 0x09: /* NEQ */ t=T;n=N; SET(2,-1) T = n != t; break;
+ case 0x29: /* NEQ2 */ t=T2;n=N2; SET(4,-3) T = n != t; break;
+ case 0x0a: /* GTH */ t=T;n=N; SET(2,-1) T = n > t; break;
+ case 0x2a: /* GTH2 */ t=T2;n=N2; SET(4,-3) T = n > t; break;
+ case 0x0b: /* LTH */ t=T;n=N; SET(2,-1) T = n < t; break;
+ case 0x2b: /* LTH2 */ t=T2;n=N2; SET(4,-3) T = n < t; break;
case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break;
case 0x2c: /* JMP2 */ t=T2; SET(2,-2) pc = t; break;
case 0x0d: /* JCN */ t=T;n=N; SET(2,-2) if(n) pc += (Sint8)t; break;
case 0x2d: /* JCN2 */ t=T2;n=L; SET(3,-3) if(n) pc = t; break;
case 0x0e: /* JSR */ t=T; SET(1,-1) FLIP SET(0,2) PUT2(pc) pc += (Sint8)t; break;
case 0x2e: /* JSR2 */ t=T2; SET(2,-2) FLIP SET(0,2) PUT2(pc) pc = t; break;
- case 0x0f: /* STH */ t=T; SET(1,-1) FLIP SET(0,1) PUT1(t) break;
+ case 0x0f: /* STH */ t=T; SET(1,-1) FLIP SET(0,1) T = t; break;
case 0x2f: /* STH2 */ t=T2; SET(2,-2) FLIP SET(0,2) PUT2(t) break;
- case 0x10: /* LDZ */ t=T; SET(1, 0) PUT1(ram[t]) break;
+ case 0x10: /* LDZ */ t=T; SET(1, 0) T = ram[t]; break;
case 0x30: /* LDZ2 */ t=T; SET(1, 1) PUT2(PEEK2(ram + t)) break;
case 0x11: /* STZ */ t=T;n=N; SET(2,-2) ram[t] = n; break;
case 0x31: /* STZ2 */ t=T;n=H2; SET(3,-3) rr = ram + t; POKE2(rr, n) break;
- case 0x12: /* LDR */ t=T; SET(1, 0) PUT1(ram[pc + (Sint8)t]) break;
+ case 0x12: /* LDR */ t=T; SET(1, 0) T = ram[pc + (Sint8)t]; break;
case 0x32: /* LDR2 */ t=T; SET(1, 1) PUT2(PEEK2(ram + pc + (Sint8)t)) break;
case 0x13: /* STR */ t=T;n=N; SET(2,-2) ram[pc + (Sint8)t] = n; break;
case 0x33: /* STR2 */ t=T;n=H2; SET(3,-3) rr = ram + pc + (Sint8)t; POKE2(rr, n) break;
- case 0x14: /* LDA */ t=T2; SET(2,-1) PUT1(ram[t]) break;
+ case 0x14: /* LDA */ t=T2; SET(2,-1) T = ram[t]; break;
case 0x34: /* LDA2 */ t=T2; SET(2, 0) PUT2(PEEK2(ram + t)) break;
case 0x15: /* STA */ t=T2;n=L; SET(3,-3) ram[t] = n; break;
case 0x35: /* STA2 */ t=T2;n=N2; SET(4,-4) rr = ram + t; POKE2(rr, n) break;
- case 0x16: /* DEI */ t=T; SET(1, 0) PUT1(DEI(t)) break;
- case 0x36: /* DEI2 */ t=T; SET(1, 1) PUT1x2(DEI(t + 1), DEI(t)) break;
+ case 0x16: /* DEI */ t=T; SET(1, 0) T = DEI(t); break;
+ case 0x36: /* DEI2 */ t=T; SET(1, 1) T = DEI(t + 1); N = DEI(t); break;
case 0x17: /* DEO */ t=T;n=N; SET(2,-2) DEO(t, n) break;
case 0x37: /* DEO2 */ t=T;n=N;l=L; SET(3,-3) DEO(t, l) DEO((t + 1), n) break;
- case 0x18: /* ADD */ t=T;n=N; SET(2,-1) PUT1(n + t) break;
+ case 0x18: /* ADD */ t=T;n=N; SET(2,-1) T = n + t; break;
case 0x38: /* ADD2 */ t=T2;n=N2; SET(4,-2) PUT2(n + t) break;
- case 0x19: /* SUB */ t=T;n=N; SET(2,-1) PUT1(n - t) break;
+ case 0x19: /* SUB */ t=T;n=N; SET(2,-1) T = n - t; break;
case 0x39: /* SUB2 */ t=T2;n=N2; SET(4,-2) PUT2(n - t) break;
- case 0x1a: /* MUL */ t=T;n=N; SET(2,-1) PUT1(n * t) break;
+ case 0x1a: /* MUL */ t=T;n=N; SET(2,-1) T = n * t; break;
case 0x3a: /* MUL2 */ t=T2;n=N2; SET(4,-2) PUT2(n * t) break;
- case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) if(!t) HALT(3) PUT1(n / t) break;
+ case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) if(!t) HALT(3) T = n / t; break;
case 0x3b: /* DIV2 */ t=T2;n=N2; SET(4,-2) if(!t) HALT(3) PUT2(n / t) break;
- case 0x1c: /* AND */ t=T;n=N; SET(2,-1) PUT1(n & t) break;
+ case 0x1c: /* AND */ t=T;n=N; SET(2,-1) T = n & t; break;
case 0x3c: /* AND2 */ t=T2;n=N2; SET(4,-2) PUT2(n & t) break;
- case 0x1d: /* ORA */ t=T;n=N; SET(2,-1) PUT1(n | t) break;
+ case 0x1d: /* ORA */ t=T;n=N; SET(2,-1) T = n | t; break;
case 0x3d: /* ORA2 */ t=T2;n=N2; SET(4,-2) PUT2(n | t) break;
- case 0x1e: /* EOR */ t=T;n=N; SET(2,-1) PUT1(n ^ t) break;
+ case 0x1e: /* EOR */ t=T;n=N; SET(2,-1) T = n ^ t; break;
case 0x3e: /* EOR2 */ t=T2;n=N2; SET(4,-2) PUT2(n ^ t) break;
- case 0x1f: /* SFT */ t=T;n=N; SET(2,-1) PUT1(n >> (t & 0xf) << (t >> 4)) break;
+ case 0x1f: /* SFT */ t=T;n=N; SET(2,-1) T = n >> (t & 0xf) << (t >> 4); break;
case 0x3f: /* SFT2 */ t=T;n=H2; SET(3,-1) PUT2(n >> (t & 0xf) << (t >> 4)) break;
}
}
diff --git a/src/uxn.h b/src/uxn.h
@@ -13,6 +13,7 @@ WITH REGARD TO THIS SOFTWARE.
#define PEEK2(d) (*(d) << 8 | (d)[1])
#define POKE2(d, v) { *(d) = (v) >> 8; (d)[1] = (v); }
+#define POKE2c(cache, d, v) { cache = (d); POKE2(cache, v) }
#define DEI(p) (dei_masks[p] ? emu_dei(u, (p)) : u->dev[(p)])
#define DEO(p, v) { u->dev[p] = v; if(deo_masks[p]) emu_deo(u, p); }
