commit 8be4980

Devine Lu Linvega  ·  2024-07-02 01:04:09 +0000 UTC
parent 72994b6
Faster IMM opcodes
1 files changed,  +8, -6
+8, -6
 1@@ -20,7 +20,7 @@ WITH REGARD TO THIS SOFTWARE.
 2 #define FLP { s = ins & 0x40 ? &uxn.wst : &uxn.rst; }
 3 #define JMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
 4 #define PO1(o) { o = s->dat[--*sp]; }
 5-#define PO2(o) { o = s->dat[--*sp] | (s->dat[--*sp] << 0x8); }
 6+#define PO2(o) { o = s->dat[--*sp] | (s->dat[--*sp] << 8); }
 7 #define POx(o) { if(m2) { PO2(o) } else PO1(o) }
 8 #define PU1(y) { s->dat[s->ptr++] = (y); }
 9 #define PU2(y) { tt = (y); s->dat[s->ptr++] = tt >> 0x8; s->dat[s->ptr++] = tt; }
10@@ -46,11 +46,13 @@ uxn_eval(Uint16 pc)
11 		case 0x00:
12 		switch(ins) {
13 			/* BRK */ case 0x00: return 1;
14-			/* JCI */ case 0x20: PO1(b) if(!b) { pc += 2; break; } a = uxn.ram[pc++] << 8 | uxn.ram[pc++]; pc += a; break;
15-			/* JMI */ case 0x40: a = uxn.ram[pc++] << 8 | uxn.ram[pc++]; pc += a; break;
16-			/* JSI */ case 0x60: PU2(pc + 2) a = uxn.ram[pc++] << 8 | uxn.ram[pc++]; pc += a; break;
17-			/* LIT2 */ case 0xa0: case 0xe0: PU1(uxn.ram[pc++]) PU1(uxn.ram[pc++]) break;
18-			/* LIT  */ case 0x80: case 0xc0: PU1(uxn.ram[pc++]) break;
19+			/* JCI */ case 0x20: if(uxn.wst.dat[--uxn.wst.ptr]) goto JMI; pc += 2; break;
20+			/* JMI */ case 0x40: JMI: a = uxn.ram[pc++] << 8 | uxn.ram[pc++]; pc += a; break;
21+			/* JSI */ case 0x60: tt = pc + 2; uxn.rst.dat[uxn.rst.ptr++] = tt >> 8; uxn.rst.dat[uxn.rst.ptr++] = tt; goto JMI;
22+			/* LIT2  */ case 0xa0: uxn.wst.dat[uxn.wst.ptr++] = uxn.ram[pc++], uxn.wst.dat[uxn.wst.ptr++] = uxn.ram[pc++]; break;
23+			/* LIT2r */ case 0xe0: uxn.rst.dat[uxn.rst.ptr++] = uxn.ram[pc++], uxn.rst.dat[uxn.rst.ptr++] = uxn.ram[pc++]; break;
24+			/* LIT   */ case 0x80: uxn.wst.dat[uxn.wst.ptr++] = uxn.ram[pc++]; break;
25+			/* LITr  */ case 0xc0: uxn.rst.dat[uxn.rst.ptr++] = uxn.ram[pc++]; break;
26 		} break;
27 		/* INC */ OPC(0x01, POx(a) PUx(a + 1))
28 		/* POP */ OPC(0x02, POx(a))