commit 6bdb6ca1681a1035124ec4ebc35b56a3e751086c
parent fa6d62c70a9f643814d967275c1b76c53be04f91
Author: neauoire <aliceffekt@gmail.com>
Date: Thu, 9 Nov 2023 13:46:10 -0800
Optimized core
Diffstat:
3 files changed, 78 insertions(+), 74 deletions(-)
diff --git a/build.sh b/build.sh
@@ -106,6 +106,6 @@ if [ $norun = 1 ]; then exit; fi
./bin/uxncli -v
./bin/uxnemu -v
-./bin/uxnasm projects/examples/devices/audio-tests.tal bin/audio-tests.rom
+./bin/uxnasm projects/examples/devices/mouse.tal bin/mouse.rom
-./bin/uxnemu -2x bin/audio-tests.rom
+./bin/uxnemu -2x bin/mouse.rom
diff --git a/src/uxn.c b/src/uxn.c
@@ -43,77 +43,81 @@ uxn_eval(Uxn *u, Uint16 pc)
for(;;) {
Uint8 ins = ram[pc++];
Stack *s = ins & 0x40 ? &u->rst : &u->wst;
- switch(ins & 0x1f ? ins & 0x3f : ins) {
- /* IMM */
- case 0x00: /* BRK */ return 1;
- case 0x20: /* JCI */ t=T; SHIFT(-1) if(!t) { pc += 2; break; }
- case 0x40: /* JMI */ rr = ram + pc; pc += 2 + PEEK2(rr); break;
- case 0x60: /* JSI */ SHIFT( 2) rr = ram + pc; pc += 2; T2_(pc); pc += PEEK2(rr); break;
- case 0x80: /* LIT */ case 0xc0: SHIFT( 1) T = ram[pc++]; break;
- case 0xa0: /* LIT2 */ case 0xe0: SHIFT( 2) N = ram[pc++]; T = ram[pc++]; break;
- /* ALU */
- case 0x01: /* INC */ t=T; SET(1, 0) T = t + 1; break;
- case 0x21: /* INC2 */ t=T2; SET(2, 0) T2_(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) T = t; break;
- case 0x23: /* NIP2 */ t=T2; SET(4,-2) T2_(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) T2_(n) N2_(t) 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) T2_(l) N2_(t) L2_(n) break;
- case 0x06: /* DUP */ t=T; SET(1, 1) T = t; N = t; break;
- case 0x26: /* DUP2 */ t=T2; SET(2, 2) T2_(t) N2_(t) 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) T2_(n) N2_(t) L2_(n) 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 SHIFT(2) T2_(pc) pc += (Sint8)t; break;
- case 0x2e: /* JSR2 */ t=T2; SET(2,-2) FLIP SHIFT(2) T2_(pc) pc = t; break;
- case 0x0f: /* STH */ t=T; SET(1,-1) FLIP SHIFT(1) T = t; break;
- case 0x2f: /* STH2 */ t=T2; SET(2,-2) FLIP SHIFT(2) T2_(t) break;
- case 0x10: /* LDZ */ t=T; SET(1, 0) T = ram[t]; break;
- case 0x30: /* LDZ2 */ t=T; SET(1, 1) N = ram[t++]; T = ram[(Uint8)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) ram[t++] = n >> 8; ram[(Uint8)t] = n; break;
- case 0x12: /* LDR */ t=T; SET(1, 0) r = pc + (Sint8)t; T = ram[r]; break;
- case 0x32: /* LDR2 */ t=T; SET(1, 1) r = pc + (Sint8)t; N = ram[r++]; T = ram[r]; break;
- case 0x13: /* STR */ t=T;n=N; SET(2,-2) r = pc + (Sint8)t; ram[r] = n; break;
- case 0x33: /* STR2 */ t=T;n=H2; SET(3,-3) r = pc + (Sint8)t; ram[r++] = n >> 8; ram[r] = n; break;
- case 0x14: /* LDA */ t=T2; SET(2,-1) T = ram[t]; break;
- case 0x34: /* LDA2 */ t=T2; SET(2, 0) N = ram[t++]; T = 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) ram[t++] = n >> 8; ram[t] = n; break;
- case 0x16: /* DEI */ t=T; SET(1, 0) T = emu_dei(u, t); break;
- case 0x36: /* DEI2 */ t=T; SET(1, 1) N = emu_dei(u, t++); T = emu_dei(u, t); break;
- case 0x17: /* DEO */ t=T;n=N; SET(2,-2) emu_deo(u, t, n); break;
- case 0x37: /* DEO2 */ t=T;n=N;l=L; SET(3,-3) emu_deo(u, t++, l); emu_deo(u, t, n); 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) T2_(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) T2_(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) T2_(n * t) break;
- case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) T = t ? n / t : 0; break;
- case 0x3b: /* DIV2 */ t=T2;n=N2; SET(4,-2) T2_(t ? n / t : 0) 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) T2_(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) T2_(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) T2_(n ^ t) 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) T2_(n >> (t & 0xf) << (t >> 4)) break;
+ switch(ins & 0x3f) {
+ /* IMM */
+ case 0x00: case 0x20:
+ switch(ins) {
+ case 0x00: /* BRK */ return 1;
+ case 0x20: /* JCI */ t=T; SHIFT(-1) if(!t) { pc += 2; break; }
+ case 0x40: /* JMI */ rr = ram + pc; pc += 2 + PEEK2(rr); break;
+ case 0x60: /* JSI */ SHIFT( 2) rr = ram + pc; pc += 2; T2_(pc); pc += PEEK2(rr); break;
+ case 0x80: /* LIT */ case 0xc0: SHIFT( 1) T = ram[pc++]; break;
+ case 0xa0: /* LIT2 */ case 0xe0: SHIFT( 2) N = ram[pc++]; T = ram[pc++]; break;
+ }
+ break;
+ /* ALU */
+ case 0x01: /* INC */ t=T; SET(1, 0) T = t + 1; break;
+ case 0x21: /* INC2 */ t=T2; SET(2, 0) T2_(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) T = t; break;
+ case 0x23: /* NIP2 */ t=T2; SET(4,-2) T2_(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) T2_(n) N2_(t) 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) T2_(l) N2_(t) L2_(n) break;
+ case 0x06: /* DUP */ t=T; SET(1, 1) T = t; N = t; break;
+ case 0x26: /* DUP2 */ t=T2; SET(2, 2) T2_(t) N2_(t) 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) T2_(n) N2_(t) L2_(n) 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 SHIFT(2) T2_(pc) pc += (Sint8)t; break;
+ case 0x2e: /* JSR2 */ t=T2; SET(2,-2) FLIP SHIFT(2) T2_(pc) pc = t; break;
+ case 0x0f: /* STH */ t=T; SET(1,-1) FLIP SHIFT(1) T = t; break;
+ case 0x2f: /* STH2 */ t=T2; SET(2,-2) FLIP SHIFT(2) T2_(t) break;
+ case 0x10: /* LDZ */ t=T; SET(1, 0) T = ram[t]; break;
+ case 0x30: /* LDZ2 */ t=T; SET(1, 1) N = ram[t++]; T = ram[(Uint8)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) ram[t++] = n >> 8; ram[(Uint8)t] = n; break;
+ case 0x12: /* LDR */ t=T; SET(1, 0) r = pc + (Sint8)t; T = ram[r]; break;
+ case 0x32: /* LDR2 */ t=T; SET(1, 1) r = pc + (Sint8)t; N = ram[r++]; T = ram[r]; break;
+ case 0x13: /* STR */ t=T;n=N; SET(2,-2) r = pc + (Sint8)t; ram[r] = n; break;
+ case 0x33: /* STR2 */ t=T;n=H2; SET(3,-3) r = pc + (Sint8)t; ram[r++] = n >> 8; ram[r] = n; break;
+ case 0x14: /* LDA */ t=T2; SET(2,-1) T = ram[t]; break;
+ case 0x34: /* LDA2 */ t=T2; SET(2, 0) N = ram[t++]; T = 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) ram[t++] = n >> 8; ram[t] = n; break;
+ case 0x16: /* DEI */ t=T; SET(1, 0) T = emu_dei(u, t); break;
+ case 0x36: /* DEI2 */ t=T; SET(1, 1) N = emu_dei(u, t++); T = emu_dei(u, t); break;
+ case 0x17: /* DEO */ t=T;n=N; SET(2,-2) emu_deo(u, t, n); break;
+ case 0x37: /* DEO2 */ t=T;n=N;l=L; SET(3,-3) emu_deo(u, t++, l); emu_deo(u, t, n); 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) T2_(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) T2_(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) T2_(n * t) break;
+ case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) T = t ? n / t : 0; break;
+ case 0x3b: /* DIV2 */ t=T2;n=N2; SET(4,-2) T2_(t ? n / t : 0) 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) T2_(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) T2_(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) T2_(n ^ t) 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) T2_(n >> (t & 0xf) << (t >> 4)) break;
}
}
}
diff --git a/src/uxnasm.c b/src/uxnasm.c
@@ -500,7 +500,7 @@ main(int argc, char *argv[])
FILE *src, *dst;
if(argc == 2 && argv[1][0] == '-' && argv[1][1] == 'v')
return !fprintf(stdout, "Uxnasm - Uxntal Assembler, 27 Oct 2023.\n");
- if (argc != 3)
+ if(argc != 3)
return error("usage", "uxnasm [-v] input.tal output.rom");
if(!(src = fopen(argv[1], "r")))
return !error("Invalid input", argv[1]);
