commit a3d0fc8

Devine Lu Linvega  ·  2024-07-02 04:00:24 +0000 UTC
parent 8be4980
Unroll core
1 files changed,  +20, -21
+20, -21
 1@@ -11,12 +11,6 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 2 WITH REGARD TO THIS SOFTWARE.
 3 */
 4 
 5-/* Registers
 6-[ Z ][ Y ][ X ][ L ][ N ][ T ] <
 7-[ . ][ . ][ . ][   H2   ][ . ] <
 8-[   L2   ][   N2   ][   T2   ] <
 9-*/
10-
11 #define FLP { s = ins & 0x40 ? &uxn.wst : &uxn.rst; }
12 #define JMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
13 #define PO1(o) { o = s->dat[--*sp]; }
14@@ -30,7 +24,16 @@ WITH REGARD TO THIS SOFTWARE.
15 #define DEI(o, p) { if(m2) { o = (emu_dei(p) << 8) | emu_dei(p + 1); } else o = emu_dei(p); }
16 #define DEO(p, y) { if(m2) { emu_deo(p, y >> 8); emu_deo(p + 1, y); } else emu_deo(p, y); }
17 
18-#define OPC(x, body) { case x: body break; }
19+#define OPC(op, body) { \
20+	case 0x00|0x00|0x00|op: {m2 = 0, s = &uxn.wst, sp = &s->ptr; body break;}\
21+	case 0x00|0x00|0x20|op: {m2 = 1, s = &uxn.wst, sp = &s->ptr; body break;}\
22+	case 0x00|0x40|0x00|op: {m2 = 0, s = &uxn.rst, sp = &s->ptr; body break;}\
23+	case 0x00|0x40|0x20|op: {m2 = 1, s = &uxn.rst, sp = &s->ptr; body break;}\
24+	case 0x80|0x00|0x00|op: {m2 = 0, s = &uxn.wst, kp = s->ptr, sp = &kp; body break;}\
25+	case 0x80|0x00|0x20|op: {m2 = 1, s = &uxn.wst, kp = s->ptr, sp = &kp; body break;}\
26+	case 0x80|0x40|0x00|op: {m2 = 0, s = &uxn.rst, kp = s->ptr, sp = &kp; body break;}\
27+	case 0x80|0x40|0x20|op: {m2 = 1, s = &uxn.rst, kp = s->ptr, sp = &kp; body break;}\
28+}
29 
30 int
31 uxn_eval(Uint16 pc)
32@@ -39,21 +42,17 @@ uxn_eval(Uint16 pc)
33 	for(;;) {
34 		Uint16 tt, a, b, c;
35 		Uint8 t, kp, *sp, ins = uxn.ram[pc++];
36-		/* 2 */ Uint8 m2 = ins & 0x20;
37-		/* r */ Stack *s = ins & 0x40 ? &uxn.rst : &uxn.wst;
38-		/* k */ if(ins & 0x80) kp = s->ptr, sp = &kp; else sp = &s->ptr;
39-		switch(ins & 0x1f) {
40-		case 0x00:
41+		int m2 = 0;
42+		Stack *s;
43 		switch(ins) {
44-			/* BRK */ case 0x00: return 1;
45-			/* JCI */ case 0x20: if(uxn.wst.dat[--uxn.wst.ptr]) goto JMI; pc += 2; break;
46-			/* JMI */ case 0x40: JMI: a = uxn.ram[pc++] << 8 | uxn.ram[pc++]; pc += a; break;
47-			/* JSI */ case 0x60: tt = pc + 2; uxn.rst.dat[uxn.rst.ptr++] = tt >> 8; uxn.rst.dat[uxn.rst.ptr++] = tt; goto JMI;
48-			/* LIT2  */ case 0xa0: uxn.wst.dat[uxn.wst.ptr++] = uxn.ram[pc++], uxn.wst.dat[uxn.wst.ptr++] = uxn.ram[pc++]; break;
49-			/* LIT2r */ case 0xe0: uxn.rst.dat[uxn.rst.ptr++] = uxn.ram[pc++], uxn.rst.dat[uxn.rst.ptr++] = uxn.ram[pc++]; break;
50-			/* LIT   */ case 0x80: uxn.wst.dat[uxn.wst.ptr++] = uxn.ram[pc++]; break;
51-			/* LITr  */ case 0xc0: uxn.rst.dat[uxn.rst.ptr++] = uxn.ram[pc++]; break;
52-		} break;
53+		/* BRK */ case 0x00: return 1;
54+		/* JCI */ case 0x20: if(uxn.wst.dat[--uxn.wst.ptr]) goto JMI; pc += 2; break;
55+		/* JMI */ case 0x40: JMI: a = uxn.ram[pc++] << 8 | uxn.ram[pc++]; pc += a; break;
56+		/* JSI */ case 0x60: tt = pc + 2; uxn.rst.dat[uxn.rst.ptr++] = tt >> 8; uxn.rst.dat[uxn.rst.ptr++] = tt; goto JMI;
57+		/* LIT2  */ case 0xa0: uxn.wst.dat[uxn.wst.ptr++] = uxn.ram[pc++], uxn.wst.dat[uxn.wst.ptr++] = uxn.ram[pc++]; break;
58+		/* LIT2r */ case 0xe0: uxn.rst.dat[uxn.rst.ptr++] = uxn.ram[pc++], uxn.rst.dat[uxn.rst.ptr++] = uxn.ram[pc++]; break;
59+		/* LIT   */ case 0x80: uxn.wst.dat[uxn.wst.ptr++] = uxn.ram[pc++]; break;
60+		/* LITr  */ case 0xc0: uxn.rst.dat[uxn.rst.ptr++] = uxn.ram[pc++]; break;
61 		/* INC */ OPC(0x01, POx(a) PUx(a + 1))
62 		/* POP */ OPC(0x02, POx(a))
63 		/* NIP */ OPC(0x03, POx(a) POx(b) PUx(a))