Dariaceli's Git
Browse code

Optimized core

neauoire authored on 09/11/2023 21:46:10
Showing 3 changed files
build.sh
History View file @ 6bdb6ca
... ... 
@@ -106,6 +106,6 @@ if [ $norun = 1 ]; then exit; fi
106 106 
 ./bin/uxncli -v
107 107 
 ./bin/uxnemu -v
108 108
109 
-./bin/uxnasm projects/examples/devices/audio-tests.tal bin/audio-tests.rom
109 
+./bin/uxnasm projects/examples/devices/mouse.tal bin/mouse.rom
110 110
111 
-./bin/uxnemu -2x bin/audio-tests.rom
111 
+./bin/uxnemu -2x bin/mouse.rom
src/uxn.c
History View file @ 6bdb6ca
... ... 
@@ -43,77 +43,81 @@ uxn_eval(Uxn *u, Uint16 pc)
43 43 
 	for(;;) {
44 44 
 		Uint8 ins = ram[pc++];
45 45 
 		Stack *s = ins & 0x40 ? &u->rst : &u->wst;
46 
-		switch(ins & 0x1f ? ins & 0x3f : ins) {
47 
-			/* IMM */
48 
-			case 0x00: /* BRK  */                           return 1;
49 
-			case 0x20: /* JCI  */ t=T;            SHIFT(-1) if(!t) { pc += 2; break; }
50 
-			case 0x40: /* JMI  */                           rr = ram + pc; pc += 2 + PEEK2(rr); break;
51 
-			case 0x60: /* JSI  */                 SHIFT( 2) rr = ram + pc; pc += 2; T2_(pc); pc += PEEK2(rr); break;
52 
-			case 0x80: /* LIT  */ case 0xc0:      SHIFT( 1) T = ram[pc++]; break;
53 
-			case 0xa0: /* LIT2 */ case 0xe0:      SHIFT( 2) N = ram[pc++]; T = ram[pc++]; break;
54 
-			/* ALU */
55 
-			case 0x01: /* INC  */ t=T;            SET(1, 0) T = t + 1; break;
56 
-			case 0x21: /* INC2 */ t=T2;           SET(2, 0) T2_(t + 1) break;
57 
-			case 0x02: /* POP  */                 SET(1,-1) break;
58 
-			case 0x22: /* POP2 */                 SET(2,-2) break;
59 
-			case 0x03: /* NIP  */ t=T;            SET(2,-1) T = t; break;
60 
-			case 0x23: /* NIP2 */ t=T2;           SET(4,-2) T2_(t) break;
61 
-			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) T = n; N = t; break;
62 
-			case 0x24: /* SWP2 */ t=T2;n=N2;      SET(4, 0) T2_(n) N2_(t) break;
63 
-			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) T = l; N = t; L = n; break;
64 
-			case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) T2_(l) N2_(t) L2_(n) break;
65 
-			case 0x06: /* DUP  */ t=T;            SET(1, 1) T = t; N = t; break;
66 
-			case 0x26: /* DUP2 */ t=T2;           SET(2, 2) T2_(t) N2_(t) break;
67 
-			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) T = n; N = t; L = n; break;
68 
-			case 0x27: /* OVR2 */ t=T2;n=N2;      SET(4, 2) T2_(n) N2_(t) L2_(n) 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;
77 
-			case 0x0c: /* JMP  */ t=T;            SET(1,-1) pc += (Sint8)t; break;
78 
-			case 0x2c: /* JMP2 */ t=T2;           SET(2,-2) pc = t; break;
79 
-			case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) if(n) pc += (Sint8)t; break;
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 SHIFT(2) T2_(pc) pc += (Sint8)t; break;
82 
-			case 0x2e: /* JSR2 */ t=T2;           SET(2,-2) FLIP SHIFT(2) T2_(pc) pc = t; break;
83 
-			case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SHIFT(1) T = t; break;
84 
-			case 0x2f: /* STH2 */ t=T2;           SET(2,-2) FLIP SHIFT(2) T2_(t) break;
85 
-			case 0x10: /* LDZ  */ t=T;            SET(1, 0) T = ram[t]; break;
86 
-			case 0x30: /* LDZ2 */ t=T;            SET(1, 1) N = ram[t++]; T = ram[(Uint8)t]; break;
87 
-			case 0x11: /* STZ  */ t=T;n=N;        SET(2,-2) ram[t] = n; break;
88 
-			case 0x31: /* STZ2 */ t=T;n=H2;       SET(3,-3) ram[t++] = n >> 8; ram[(Uint8)t] = n; break;
89 
-			case 0x12: /* LDR  */ t=T;            SET(1, 0) r = pc + (Sint8)t; T = ram[r]; break;
90 
-			case 0x32: /* LDR2 */ t=T;            SET(1, 1) r = pc + (Sint8)t; N = ram[r++]; T = ram[r]; break;
91 
-			case 0x13: /* STR  */ t=T;n=N;        SET(2,-2) r = pc + (Sint8)t; ram[r] = n; break;
92 
-			case 0x33: /* STR2 */ t=T;n=H2;       SET(3,-3) r = pc + (Sint8)t; ram[r++] = n >> 8; ram[r] = n; break;
93 
-			case 0x14: /* LDA  */ t=T2;           SET(2,-1) T = ram[t]; break;
94 
-			case 0x34: /* LDA2 */ t=T2;           SET(2, 0) N = ram[t++]; T = ram[t]; break;
95 
-			case 0x15: /* STA  */ t=T2;n=L;       SET(3,-3) ram[t] = n; break;
96 
-			case 0x35: /* STA2 */ t=T2;n=N2;      SET(4,-4) ram[t++] = n >> 8; ram[t] = n; break;
97 
-			case 0x16: /* DEI  */ t=T;            SET(1, 0) T = emu_dei(u, t); break;
98 
-			case 0x36: /* DEI2 */ t=T;            SET(1, 1) N = emu_dei(u, t++); T = emu_dei(u, t); break;
99 
-			case 0x17: /* DEO  */ t=T;n=N;        SET(2,-2) emu_deo(u, t, n); break;
100 
-			case 0x37: /* DEO2 */ t=T;n=N;l=L;    SET(3,-3) emu_deo(u, t++, l); emu_deo(u, t, n); break;
101 
-			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) T = n + t; break;
102 
-			case 0x38: /* ADD2 */ t=T2;n=N2;      SET(4,-2) T2_(n + t) break;
103 
-			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) T = n - t; break;
104 
-			case 0x39: /* SUB2 */ t=T2;n=N2;      SET(4,-2) T2_(n - t) break;
105 
-			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) T = n * t; break;
106 
-			case 0x3a: /* MUL2 */ t=T2;n=N2;      SET(4,-2) T2_(n * t) break;
107 
-			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) T = t ? n / t : 0; break;
108 
-			case 0x3b: /* DIV2 */ t=T2;n=N2;      SET(4,-2) T2_(t ? n / t : 0) break;
109 
-			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) T = n & t; break;
110 
-			case 0x3c: /* AND2 */ t=T2;n=N2;      SET(4,-2) T2_(n & t) break;
111 
-			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) T = n | t; break;
112 
-			case 0x3d: /* ORA2 */ t=T2;n=N2;      SET(4,-2) T2_(n | t) break;
113 
-			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) T = n ^ t; break;
114 
-			case 0x3e: /* EOR2 */ t=T2;n=N2;      SET(4,-2) T2_(n ^ t) break;
115 
-			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) T = n >> (t & 0xf) << (t >> 4); break;
116 
-			case 0x3f: /* SFT2 */ t=T;n=H2;       SET(3,-1) T2_(n >> (t & 0xf) << (t >> 4)) break;
46 
+		switch(ins & 0x3f) {
47 
+		/* IMM */
48 
+		case 0x00: case 0x20:
49 
+			switch(ins) {
50 
+			case 0x00: /* BRK  */                       return 1;
51 
+			case 0x20: /* JCI  */ t=T;        SHIFT(-1) if(!t) { pc += 2; break; }
52 
+			case 0x40: /* JMI  */                       rr = ram + pc; pc += 2 + PEEK2(rr); break;
53 
+			case 0x60: /* JSI  */             SHIFT( 2) rr = ram + pc; pc += 2; T2_(pc); pc += PEEK2(rr); break;
54 
+			case 0x80: /* LIT  */ case 0xc0:  SHIFT( 1) T = ram[pc++]; break;
55 
+			case 0xa0: /* LIT2 */ case 0xe0:  SHIFT( 2) N = ram[pc++]; T = ram[pc++]; break;
56 
+			}
57 
+			break;
58 
+		/* ALU */
59 
+		case 0x01: /* INC  */ t=T;            SET(1, 0) T = t + 1; break;
60 
+		case 0x21: /* INC2 */ t=T2;           SET(2, 0) T2_(t + 1) break;
61 
+		case 0x02: /* POP  */                 SET(1,-1) break;
62 
+		case 0x22: /* POP2 */                 SET(2,-2) break;
63 
+		case 0x03: /* NIP  */ t=T;            SET(2,-1) T = t; break;
64 
+		case 0x23: /* NIP2 */ t=T2;           SET(4,-2) T2_(t) break;
65 
+		case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) T = n; N = t; break;
66 
+		case 0x24: /* SWP2 */ t=T2;n=N2;      SET(4, 0) T2_(n) N2_(t) break;
67 
+		case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) T = l; N = t; L = n; break;
68 
+		case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) T2_(l) N2_(t) L2_(n) break;
69 
+		case 0x06: /* DUP  */ t=T;            SET(1, 1) T = t; N = t; break;
70 
+		case 0x26: /* DUP2 */ t=T2;           SET(2, 2) T2_(t) N2_(t) break;
71 
+		case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) T = n; N = t; L = n; break;
72 
+		case 0x27: /* OVR2 */ t=T2;n=N2;      SET(4, 2) T2_(n) N2_(t) L2_(n) break;
73 
+		case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) T = n == t; break;
74 
+		case 0x28: /* EQU2 */ t=T2;n=N2;      SET(4,-3) T = n == t; break;
75 
+		case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) T = n != t; break;
76 
+		case 0x29: /* NEQ2 */ t=T2;n=N2;      SET(4,-3) T = n != t; break;
77 
+		case 0x0a: /* GTH  */ t=T;n=N;        SET(2,-1) T = n > t; break;
78 
+		case 0x2a: /* GTH2 */ t=T2;n=N2;      SET(4,-3) T = n > t; break;
79 
+		case 0x0b: /* LTH  */ t=T;n=N;        SET(2,-1) T = n < t; break;
80 
+		case 0x2b: /* LTH2 */ t=T2;n=N2;      SET(4,-3) T = n < t; break;
81 
+		case 0x0c: /* JMP  */ t=T;            SET(1,-1) pc += (Sint8)t; break;
82 
+		case 0x2c: /* JMP2 */ t=T2;           SET(2,-2) pc = t; break;
83 
+		case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) if(n) pc += (Sint8)t; break;
84 
+		case 0x2d: /* JCN2 */ t=T2;n=L;       SET(3,-3) if(n) pc = t; break;
85 
+		case 0x0e: /* JSR  */ t=T;            SET(1,-1) FLIP SHIFT(2) T2_(pc) pc += (Sint8)t; break;
86 
+		case 0x2e: /* JSR2 */ t=T2;           SET(2,-2) FLIP SHIFT(2) T2_(pc) pc = t; break;
87 
+		case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SHIFT(1) T = t; break;
88 
+		case 0x2f: /* STH2 */ t=T2;           SET(2,-2) FLIP SHIFT(2) T2_(t) break;
89 
+		case 0x10: /* LDZ  */ t=T;            SET(1, 0) T = ram[t]; break;
90 
+		case 0x30: /* LDZ2 */ t=T;            SET(1, 1) N = ram[t++]; T = ram[(Uint8)t]; break;
91 
+		case 0x11: /* STZ  */ t=T;n=N;        SET(2,-2) ram[t] = n; break;
92 
+		case 0x31: /* STZ2 */ t=T;n=H2;       SET(3,-3) ram[t++] = n >> 8; ram[(Uint8)t] = n; break;
93 
+		case 0x12: /* LDR  */ t=T;            SET(1, 0) r = pc + (Sint8)t; T = ram[r]; break;
94 
+		case 0x32: /* LDR2 */ t=T;            SET(1, 1) r = pc + (Sint8)t; N = ram[r++]; T = ram[r]; break;
95 
+		case 0x13: /* STR  */ t=T;n=N;        SET(2,-2) r = pc + (Sint8)t; ram[r] = n; break;
96 
+		case 0x33: /* STR2 */ t=T;n=H2;       SET(3,-3) r = pc + (Sint8)t; ram[r++] = n >> 8; ram[r] = n; break;
97 
+		case 0x14: /* LDA  */ t=T2;           SET(2,-1) T = ram[t]; break;
98 
+		case 0x34: /* LDA2 */ t=T2;           SET(2, 0) N = ram[t++]; T = ram[t]; break;
99 
+		case 0x15: /* STA  */ t=T2;n=L;       SET(3,-3) ram[t] = n; break;
100 
+		case 0x35: /* STA2 */ t=T2;n=N2;      SET(4,-4) ram[t++] = n >> 8; ram[t] = n; break;
101 
+		case 0x16: /* DEI  */ t=T;            SET(1, 0) T = emu_dei(u, t); break;
102 
+		case 0x36: /* DEI2 */ t=T;            SET(1, 1) N = emu_dei(u, t++); T = emu_dei(u, t); break;
103 
+		case 0x17: /* DEO  */ t=T;n=N;        SET(2,-2) emu_deo(u, t, n); break;
104 
+		case 0x37: /* DEO2 */ t=T;n=N;l=L;    SET(3,-3) emu_deo(u, t++, l); emu_deo(u, t, n); break;
105 
+		case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) T = n + t; break;
106 
+		case 0x38: /* ADD2 */ t=T2;n=N2;      SET(4,-2) T2_(n + t) break;
107 
+		case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) T = n - t; break;
108 
+		case 0x39: /* SUB2 */ t=T2;n=N2;      SET(4,-2) T2_(n - t) break;
109 
+		case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) T = n * t; break;
110 
+		case 0x3a: /* MUL2 */ t=T2;n=N2;      SET(4,-2) T2_(n * t) break;
111 
+		case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) T = t ? n / t : 0; break;
112 
+		case 0x3b: /* DIV2 */ t=T2;n=N2;      SET(4,-2) T2_(t ? n / t : 0) break;
113 
+		case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) T = n & t; break;
114 
+		case 0x3c: /* AND2 */ t=T2;n=N2;      SET(4,-2) T2_(n & t) break;
115 
+		case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) T = n | t; break;
116 
+		case 0x3d: /* ORA2 */ t=T2;n=N2;      SET(4,-2) T2_(n | t) break;
117 
+		case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) T = n ^ t; break;
118 
+		case 0x3e: /* EOR2 */ t=T2;n=N2;      SET(4,-2) T2_(n ^ t) break;
119 
+		case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) T = n >> (t & 0xf) << (t >> 4); break;
120 
+		case 0x3f: /* SFT2 */ t=T;n=H2;       SET(3,-1) T2_(n >> (t & 0xf) << (t >> 4)) break;
117 121 
 		}
118 122 
 	}
119 123 
 }
src/uxnasm.c
History View file @ 6bdb6ca
... ... 
@@ -500,7 +500,7 @@ main(int argc, char *argv[])
500 500 
 	FILE *src, *dst;
501 501 
 	if(argc == 2 && argv[1][0] == '-' && argv[1][1] == 'v')
502 502 
 		return !fprintf(stdout, "Uxnasm - Uxntal Assembler, 27 Oct 2023.\n");
503 
-	if (argc != 3)
503 
+	if(argc != 3)
504 504 
 		return error("usage", "uxnasm [-v] input.tal output.rom");
505 505 
 	if(!(src = fopen(argv[1], "r")))
506 506 
 		return !error("Invalid input", argv[1]);