commit d08efece3d090f69199fe8f203ce23c2459825d4
parent 559d2ae8f25e224d6c98701a8af1c3b11e9b6b5e
Author: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Mon, 6 Mar 2023 08:31:08 -0800
(uxn-fast.c) Removed redundant macro
Diffstat:
| M | src/uxn-fast.c | | | 127 | +++++++++++++++++++++++++++++++++++++++---------------------------------------- |
1 file changed, 63 insertions(+), 64 deletions(-)
diff --git a/src/uxn-fast.c b/src/uxn-fast.c
@@ -28,8 +28,7 @@ WITH REGARD TO THIS SOFTWARE.
#define L2 PEEK16(s->dat+s->ptr-6)
#define HALT(c) { return uxn_halt(u, ins, (c), pc - 1); }
-#define INC(mul, add) { if(mul > s->ptr) HALT(1) s->ptr += k * mul + add; if(s->ptr > 254) HALT(2) }
-#define DEC(mul, sub) { if(mul > s->ptr) HALT(1) s->ptr -= !k * mul - sub; if(s->ptr > 254) HALT(2) }
+#define SET(mul, add) { if(mul > s->ptr) HALT(1) s->ptr += k * mul + add; if(s->ptr > 254) HALT(2) }
#define PUT(o, v) { s->dat[s->ptr - o - 1] = (v); }
#define PUT2(o, v) { tmp = (v); s->dat[s->ptr - o - 2] = tmp >> 8; s->dat[s->ptr - o - 1] = tmp; }
#define PUSH(stack, v) { if(s->ptr > 254) HALT(2) stack->dat[stack->ptr++] = (v); }
@@ -69,68 +68,68 @@ uxn_eval(Uxn *u, Uint16 pc)
case 0xfa: /* LITr */ PUSH(s, u->ram[pc++]) break;
case 0xf9: /* LIT2r */ PUSH2(s, PEEK16(u->ram + pc)) pc += 2; break;
/* ALU */
- case 0x21: /* INC2 */ t=T2; INC(2, 0) PUT2(0, t + 1) break;
- case 0x01: /* INC */ t=T; INC(1, 0) PUT(0, t + 1); break;
- case 0x22: /* POP2 */ DEC(2, 0) break;
- case 0x02: /* POP */ DEC(1, 0) break;
- case 0x23: /* NIP2 */ t=T2; DEC(2, 0) PUT2(0, t) break;
- case 0x03: /* NIP */ t=T; DEC(1, 0) PUT(0, t) break;
- case 0x24: /* SWP2 */ t=T2;n=N2; INC(4, 0) PUT2(2, t) PUT2(0, n) break;
- case 0x04: /* SWP */ t=T;n=N; INC(2, 0) PUT(0, n) PUT(1, t) break;
- case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; INC(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
- case 0x05: /* ROT */ t=T;n=N;l=L; INC(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break;
- case 0x26: /* DUP2 */ t=T2; INC(2, 2) PUT2(0, t) PUT2(2, t) break;
- case 0x06: /* DUP */ t=T; INC(1, 1) PUT(0, t) PUT(1, t) break;
- case 0x27: /* OVR2 */ t=T2;n=N2; INC(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
- case 0x07: /* OVR */ t=T;n=N; INC(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break;
- case 0x28: /* EQU2 */ t=T2;n=N2; INC(4,-3) PUT(0, n == t) break;
- case 0x08: /* EQU */ t=T;n=N; INC(2,-1) PUT(0, n == t) break;
- case 0x29: /* NEQ2 */ t=T2;n=N2; INC(4,-3) PUT(0, n != t) break;
- case 0x09: /* NEQ */ t=T;n=N; INC(2,-1) PUT(0, n != t) break;
- case 0x2a: /* GTH2 */ t=T2;n=N2; INC(4,-3) PUT(0, n > t) break;
- case 0x0a: /* GTH */ t=T;n=N; INC(2,-1) PUT(0, n > t) break;
- case 0x2b: /* LTH2 */ t=T2;n=N2; INC(4,-3) PUT(0, n < t) break;
- case 0x0b: /* LTH */ t=T;n=N; INC(2,-1) PUT(0, n < t) break;
- case 0x2c: /* JMP2 */ t=T2; DEC(2, 0) pc = t; break;
- case 0x0c: /* JMP */ t=T; DEC(1, 0) pc += (Sint8)t; break;
- case 0x2d: /* JCN2 */ t=T2;n=L; DEC(3, 0) if(n) pc = t; break;
- case 0x0d: /* JCN */ t=T;n=N; DEC(2, 0) pc += !!n * (Sint8)t; break;
- case 0x2e: /* JSR2 */ t=T2; DEC(2, 0) PUSH2(u->rst, pc) pc = t; break;
- case 0x0e: /* JSR */ t=T; DEC(1, 0) PUSH2(u->rst, pc) pc += (Sint8)t; break;
- case 0x2f: /* STH2 */ t=T2; DEC(2, 0) if(ins & 0x40) { PUSH2(u->wst, t) } else{ PUSH2(u->rst, t) } break;
- case 0x0f: /* STH */ t=T; DEC(1, 0) if(ins & 0x40) { PUSH(u->wst, t) } else{ PUSH(u->rst, t) } break;
- case 0x30: /* LDZ2 */ t=T; INC(1, 1) PUT2(0, PEEK16(u->ram + t)) break;
- case 0x10: /* LDZ */ t=T; INC(1, 0) PUT(0, u->ram[t]) break;
- case 0x31: /* STZ2 */ t=T;n=H2; DEC(3, 0) POKE16(u->ram + t, n) break;
- case 0x11: /* STZ */ t=T;n=N; DEC(2, 0) u->ram[t] = n; break;
- case 0x32: /* LDR2 */ t=T; INC(1, 1) PUT2(0, PEEK16(u->ram + pc + (Sint8)t)) break;
- case 0x12: /* LDR */ t=T; INC(1, 0) PUT(0, u->ram[pc + (Sint8)t]) break;
- case 0x33: /* STR2 */ t=T;n=H2; DEC(3, 0) POKE16(u->ram + pc + (Sint8)t, n) break;
- case 0x13: /* STR */ t=T;n=N; DEC(2, 0) u->ram[pc + (Sint8)t] = n; break;
- case 0x34: /* LDA2 */ t=T2; INC(2, 0) PUT2(0, PEEK16(u->ram + t)) break;
- case 0x14: /* LDA */ t=T2; INC(2,-1) PUT(0, u->ram[t]) break;
- case 0x35: /* STA2 */ t=T2;n=N2; DEC(4, 0) POKE16(u->ram + t, n) break;
- case 0x15: /* STA */ t=T2;n=L; DEC(3, 0) u->ram[t] = n; break;
- case 0x36: /* DEI2 */ t=T; INC(1, 1) DEI(1, t) DEI(0, t + 1) break;
- case 0x16: /* DEI */ t=T; INC(1, 0) DEI(0, t) break;
- case 0x37: /* DEO2 */ t=T;n=N;l=L; DEC(3, 0) DEO(t, l) DEO(t + 1, n) break;
- case 0x17: /* DEO */ t=T;n=N; DEC(2, 0) DEO(t, n) break;
- case 0x38: /* ADD2 */ t=T2;n=N2; INC(4,-2) PUT2(0, n + t) break;
- case 0x18: /* ADD */ t=T;n=N; INC(2,-1) PUT(0, n + t) break;
- case 0x39: /* SUB2 */ t=T2;n=N2; INC(4,-2) PUT2(0, n - t) break;
- case 0x19: /* SUB */ t=T;n=N; INC(2,-1) PUT(0, n - t) break;
- case 0x3a: /* MUL2 */ t=T2;n=N2; INC(4,-2) PUT2(0, n * t) break;
- case 0x1a: /* MUL */ t=T;n=N; INC(2,-1) PUT(0, n * t) break;
- case 0x3b: /* DIV2 */ t=T2;n=N2; INC(4,-2) PUT2(0, n / t) break;
- case 0x1b: /* DIV */ t=T;n=N; INC(2,-1) PUT(0, n / t) break;
- case 0x3c: /* AND2 */ t=T2;n=N2; INC(4,-2) PUT2(0, n & t) break;
- case 0x1c: /* AND */ t=T;n=N; INC(2,-1) PUT(0, n & t) break;
- case 0x3d: /* ORA2 */ t=T2;n=N2; INC(4,-2) PUT2(0, n | t) break;
- case 0x1d: /* ORA */ t=T;n=N; INC(2,-1) PUT(0, n | t) break;
- case 0x3e: /* EOR2 */ t=T2;n=N2; INC(4,-2) PUT2(0, n ^ t) break;
- case 0x1e: /* EOR */ t=T;n=N; INC(2,-1) PUT(0, n ^ t) break;
- case 0x3f: /* SFT2 */ t=T;n=H2; INC(3,-1) PUT2(0, n >> (t & 0x0f) << ((t & 0xf0) >> 4)) break;
- case 0x1f: /* SFT */ t=T;n=N; INC(2,-1) PUT(0, n >> (t & 0x0f) << ((t & 0xf0) >> 4)) break;
+ case 0x21: /* INC2 */ t=T2; SET(2, 0) PUT2(0, t + 1) break;
+ case 0x01: /* INC */ t=T; SET(1, 0) PUT(0, t + 1); break;
+ case 0x22: /* POP2 */ SET(2,-2) break;
+ case 0x02: /* POP */ SET(1,-1) break;
+ case 0x23: /* NIP2 */ t=T2; SET(2,-2) PUT2(0, t) break;
+ case 0x03: /* NIP */ t=T; SET(1,-1) PUT(0, t) break;
+ case 0x24: /* SWP2 */ t=T2;n=N2; SET(4, 0) PUT2(2, t) PUT2(0, n) break;
+ case 0x04: /* SWP */ t=T;n=N; SET(2, 0) PUT(0, n) PUT(1, t) break;
+ case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
+ case 0x05: /* ROT */ t=T;n=N;l=L; SET(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break;
+ case 0x26: /* DUP2 */ t=T2; SET(2, 2) PUT2(0, t) PUT2(2, t) break;
+ case 0x06: /* DUP */ t=T; SET(1, 1) PUT(0, t) PUT(1, t) break;
+ case 0x27: /* OVR2 */ t=T2;n=N2; SET(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
+ case 0x07: /* OVR */ t=T;n=N; SET(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break;
+ case 0x28: /* EQU2 */ t=T2;n=N2; SET(4,-3) PUT(0, n == t) break;
+ case 0x08: /* EQU */ t=T;n=N; SET(2,-1) PUT(0, n == t) break;
+ case 0x29: /* NEQ2 */ t=T2;n=N2; SET(4,-3) PUT(0, n != t) break;
+ case 0x09: /* NEQ */ t=T;n=N; SET(2,-1) PUT(0, n != t) break;
+ case 0x2a: /* GTH2 */ t=T2;n=N2; SET(4,-3) PUT(0, n > t) break;
+ case 0x0a: /* GTH */ t=T;n=N; SET(2,-1) PUT(0, n > t) break;
+ case 0x2b: /* LTH2 */ t=T2;n=N2; SET(4,-3) PUT(0, n < t) break;
+ case 0x0b: /* LTH */ t=T;n=N; SET(2,-1) PUT(0, n < t) break;
+ case 0x2c: /* JMP2 */ t=T2; SET(2,-2) pc = t; break;
+ case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break;
+ case 0x2d: /* JCN2 */ t=T2;n=L; SET(3,-3) if(n) pc = t; break;
+ case 0x0d: /* JCN */ t=T;n=N; SET(2,-2) pc += !!n * (Sint8)t; break;
+ case 0x2e: /* JSR2 */ t=T2; SET(2,-2) PUSH2(u->rst, pc) pc = t; break;
+ case 0x0e: /* JSR */ t=T; SET(1,-1) PUSH2(u->rst, pc) pc += (Sint8)t; break;
+ case 0x2f: /* STH2 */ t=T2; SET(2,-2) if(ins & 0x40) { PUSH2(u->wst, t) } else{ PUSH2(u->rst, t) } break;
+ case 0x0f: /* STH */ t=T; SET(1,-1) if(ins & 0x40) { PUSH(u->wst, t) } else{ PUSH(u->rst, t) } break;
+ case 0x30: /* LDZ2 */ t=T; SET(1, 1) PUT2(0, PEEK16(u->ram + t)) break;
+ case 0x10: /* LDZ */ t=T; SET(1, 0) PUT(0, u->ram[t]) break;
+ case 0x31: /* STZ2 */ t=T;n=H2; SET(3,-3) POKE16(u->ram + t, n) break;
+ case 0x11: /* STZ */ t=T;n=N; SET(2,-2) u->ram[t] = n; break;
+ case 0x32: /* LDR2 */ t=T; SET(1, 1) PUT2(0, PEEK16(u->ram + pc + (Sint8)t)) break;
+ case 0x12: /* LDR */ t=T; SET(1, 0) PUT(0, u->ram[pc + (Sint8)t]) break;
+ case 0x33: /* STR2 */ t=T;n=H2; SET(3,-3) POKE16(u->ram + pc + (Sint8)t, n) break;
+ case 0x13: /* STR */ t=T;n=N; SET(2,-2) u->ram[pc + (Sint8)t] = n; break;
+ case 0x34: /* LDA2 */ t=T2; SET(2, 0) PUT2(0, PEEK16(u->ram + t)) break;
+ case 0x14: /* LDA */ t=T2; SET(2,-1) PUT(0, u->ram[t]) break;
+ case 0x35: /* STA2 */ t=T2;n=N2; SET(4,-4) POKE16(u->ram + t, n) break;
+ case 0x15: /* STA */ t=T2;n=L; SET(3,-3) u->ram[t] = n; break;
+ case 0x36: /* DEI2 */ t=T; SET(1, 1) DEI(1, t) DEI(0, t + 1) break;
+ case 0x16: /* DEI */ t=T; SET(1, 0) DEI(0, t) break;
+ case 0x37: /* DEO2 */ t=T;n=N;l=L; SET(3,-3) DEO(t, l) DEO(t + 1, n) break;
+ case 0x17: /* DEO */ t=T;n=N; SET(2,-2) DEO(t, n) break;
+ case 0x38: /* ADD2 */ t=T2;n=N2; SET(4,-2) PUT2(0, n + t) break;
+ case 0x18: /* ADD */ t=T;n=N; SET(2,-1) PUT(0, n + t) break;
+ case 0x39: /* SUB2 */ t=T2;n=N2; SET(4,-2) PUT2(0, n - t) break;
+ case 0x19: /* SUB */ t=T;n=N; SET(2,-1) PUT(0, n - t) break;
+ case 0x3a: /* MUL2 */ t=T2;n=N2; SET(4,-2) PUT2(0, n * t) break;
+ case 0x1a: /* MUL */ t=T;n=N; SET(2,-1) PUT(0, n * t) break;
+ case 0x3b: /* DIV2 */ t=T2;n=N2; SET(4,-2) PUT2(0, n / t) break;
+ case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) PUT(0, n / t) break;
+ case 0x3c: /* AND2 */ t=T2;n=N2; SET(4,-2) PUT2(0, n & t) break;
+ case 0x1c: /* AND */ t=T;n=N; SET(2,-1) PUT(0, n & t) break;
+ case 0x3d: /* ORA2 */ t=T2;n=N2; SET(4,-2) PUT2(0, n | t) break;
+ case 0x1d: /* ORA */ t=T;n=N; SET(2,-1) PUT(0, n | t) break;
+ case 0x3e: /* EOR2 */ t=T2;n=N2; SET(4,-2) PUT2(0, n ^ t) break;
+ case 0x1e: /* EOR */ t=T;n=N; SET(2,-1) PUT(0, n ^ t) break;
+ case 0x3f: /* SFT2 */ t=T;n=H2; SET(3,-1) PUT2(0, n >> (t & 0x0f) << ((t & 0xf0) >> 4)) break;
+ case 0x1f: /* SFT */ t=T;n=N; SET(2,-1) PUT(0, n >> (t & 0x0f) << ((t & 0xf0) >> 4)) break;
}
}
}
