Re-inlined stack register - pita/uxn12@c01a35d

commit `c01a35d`

Devine Lu Linvega · 2026-02-15 17:04:09 +0000 UTC

parent c0e8720

Re-inlined stack register

1 files changed, +69, -61

M src/uxn11.c

+69, -61

  1@@ -1021,69 +1021,77 @@ emu_deo(const Uint8 port, const Uint8 value)
  2 /* clang-format off */
  3 
  4 #define OPC(opc, A, B) {\
  5-	case 0x00|opc:case 0x40|opc:{const int d=0;A B} break;\
  6-	case 0x20|opc:case 0x60|opc:{const int d=1;A B} break;\
  7-	case 0x80|opc:case 0xc0|opc:{const int d=0,k=*p;A *p=k;B} break;\
  8-	case 0xa0|opc:case 0xe0|opc:{const int d=1,k=*p;A *p=k;B} break;}
  9-#define DEC s[--(*p)]
 10-#define INC s[(*p)++]
 11-#define FLIP s = stk[!r], p = &ptr[!r];
 12-#define JUMP(x) b = ram[pc] << 8, b |= ram[pc + 1], pc += x + 2;
 13-#define DROP(o,m) o = DEC; if(m) o |= DEC << 8;
 14-#define TAKE(o) if(d) o[1] = DEC; o[0] = DEC;
 15-#define PUSH(i,m) { if(m) c = (i), INC = c >> 8, INC = c; else INC = i; }
 16-#define GIVE(i) INC = i[0]; if(d) INC = i[1];
 17-#define DEVO(o,r) emu_deo(o, r[0]); if(d) emu_deo(o + 1, r[1]);
 18-#define DEVI(i,r) r[0] = emu_dei(i); if(d) r[1] = emu_dei(i + 1);
 19-#define POKE(o,r,m) ram[o] = r[0]; if(d) ram[(o + 1) & m] = r[1];
 20-#define PEEK(i,r,m) r[0] = ram[i]; if(d) r[1] = ram[(i + 1) & m];
 21-
 22-static unsigned
 23-uxn_eval(Uint16 pc)
 24+	case 0x00|opc: {const Uint8 _2=0,_r=0;A B} break;\
 25+	case 0x20|opc: {const Uint8 _2=1,_r=0;A B} break;\
 26+	case 0x40|opc: {const Uint8 _2=0,_r=1;A B} break;\
 27+	case 0x60|opc: {const Uint8 _2=1,_r=1;A B} break;\
 28+	case 0x80|opc: {const Uint8 _2=0,_r=0,k=ptr[0];A ptr[0]=k;B} break;\
 29+	case 0xa0|opc: {const Uint8 _2=1,_r=0,k=ptr[0];A ptr[0]=k;B} break;\
 30+	case 0xc0|opc: {const Uint8 _2=0,_r=1,k=ptr[1];A ptr[1]=k;B} break;\
 31+	case 0xe0|opc: {const Uint8 _2=1,_r=1,k=ptr[1];A ptr[1]=k;B} break;}
 32+#define REM ptr[_r] -= 1 + _2;
 33+#define DEC(m) stk[m][--ptr[m]]
 34+#define INC(m) stk[m][ptr[m]++]
 35+#define IMM(r) { r = ram[pc++] << 8, r |= ram[pc++]; }
 36+#define MOV(x) { if(_2) pc = x; else pc += (signed char)x; }
 37+#define PO1(o) o = DEC(_r);
 38+#define PO2(o) { PO1(o) o |= DEC(_r) << 8; }
 39+#define POx(o) if(_2) PO2(o) else PO1(o)
 40+#define GOT(o) if(_2) PO1(o[1]) PO1(o[0])
 41+#define DEO(o,r) emu_deo(o, r[0]); if(_2) emu_deo(o + 1, r[1]);
 42+#define POK(o,r,m) ram[o] = r[0]; if(_2) ram[(o + 1) & m] = r[1];
 43+#define RP1(i) INC(!_r) = i;
 44+#define PU1(i) INC(_r) = i;
 45+#define PUx(i) if(_2) { c = (i); PU1(c >> 8) PU1(c) } else PU1(i)
 46+#define PUT(i) PU1(i[0]) if(_2) PU1(i[1])
 47+#define DEI(i,r) r[0] = emu_dei(i); if(_2) r[1] = emu_dei(i + 1); PUT(r)
 48+#define PEK(i,r,m) r[0] = ram[i]; if(_2) r[1] = ram[(i + 1) & m]; PUT(r)
 49+
 50+static unsigned int
 51+uxn_eval(unsigned short pc)
 52 {
 53-	Uint16 a, b, c, x[2], y[2], z[2];
 54+	unsigned int a, b, c, x[2], y[2], z[2];
 55 	for(;;) {
 56-	Uint8 op = ram[pc++], r = (op >> 6) & 1, *s = stk[r], *p = &ptr[r];
 57-	switch(op) {
 58-	/* BRK */ case 0x00:return 1;
 59-	/* JCI */ case 0x20:if(DEC) JUMP(b) else pc += 2; break;
 60-	/* JMI */ case 0x40:JUMP(b) break;
 61-	/* JSI */ case 0x60:JUMP(0) PUSH(pc,1) pc += b; break;
 62-	/* LI2 */ case 0xa0:INC = ram[pc++]; /* Fall-through */
 63-	/* LIT */ case 0x80:INC = ram[pc++]; break;
 64-	/* L2r */ case 0xe0:INC = ram[pc++]; /* Fall-through */
 65-	/* LIr */ case 0xc0:INC = ram[pc++]; break;
 66-	/* INC */ OPC(0x01,DROP(a,d),PUSH(a + 1,d))
 67-	/* POP */ OPC(0x02,*p -= 1 + d;,{})
 68-	/* NIP */ OPC(0x03,TAKE(x) *p -= 1 + d;,GIVE(x))
 69-	/* SWP */ OPC(0x04,TAKE(x) TAKE(y),GIVE(x) GIVE(y))
 70-	/* ROT */ OPC(0x05,TAKE(x) TAKE(y) TAKE(z),GIVE(y) GIVE(x) GIVE(z))
 71-	/* DUP */ OPC(0x06,TAKE(x),GIVE(x) GIVE(x))
 72-	/* OVR */ OPC(0x07,TAKE(x) TAKE(y),GIVE(y) GIVE(x) GIVE(y))
 73-	/* EQU */ OPC(0x08,DROP(a,d) DROP(b,d),PUSH(b == a,0))
 74-	/* NEQ */ OPC(0x09,DROP(a,d) DROP(b,d),PUSH(b != a,0))
 75-	/* GTH */ OPC(0x0a,DROP(a,d) DROP(b,d),PUSH(b > a,0))
 76-	/* LTH */ OPC(0x0b,DROP(a,d) DROP(b,d),PUSH(b < a,0))
 77-	/* JMP */ OPC(0x0c,DROP(a,d),pc = d ? a : pc + (Sint8)a;)
 78-	/* JCN */ OPC(0x0d,DROP(a,d) DROP(b,0),if(b) pc = d ? a : pc + (Sint8)a;)
 79-	/* JSR */ OPC(0x0e,DROP(a,d),FLIP PUSH(pc,1) pc = d ? a : pc + (Sint8)a;)
 80-	/* STH */ OPC(0x0f,TAKE(x),FLIP PUSH(x[0],0) if(d) PUSH(x[1],0))
 81-	/* LDZ */ OPC(0x10,DROP(a,0),PEEK(a, x, 0xff) GIVE(x))
 82-	/* STZ */ OPC(0x11,DROP(a,0) TAKE(y),POKE(a, y, 0xff))
 83-	/* LDR */ OPC(0x12,DROP(a,0),PEEK(pc + (Sint8)a, x, 0xffff) GIVE(x))
 84-	/* STR */ OPC(0x13,DROP(a,0) TAKE(y),POKE(pc + (Sint8)a, y, 0xffff))
 85-	/* LDA */ OPC(0x14,DROP(a,1),PEEK(a, x, 0xffff) GIVE(x))
 86-	/* STA */ OPC(0x15,DROP(a,1) TAKE(y),POKE(a, y, 0xffff))
 87-	/* DEI */ OPC(0x16,DROP(a,0),DEVI(a, x) GIVE(x))
 88-	/* DEO */ OPC(0x17,DROP(a,0) TAKE(y),DEVO(a, y))
 89-	/* ADD */ OPC(0x18,DROP(a,d) DROP(b,d),PUSH(b + a,d))
 90-	/* SUB */ OPC(0x19,DROP(a,d) DROP(b,d),PUSH(b - a,d))
 91-	/* MUL */ OPC(0x1a,DROP(a,d) DROP(b,d),PUSH(b * a,d))
 92-	/* DIV */ OPC(0x1b,DROP(a,d) DROP(b,d),PUSH(a ? b / a : 0,d))
 93-	/* AND */ OPC(0x1c,DROP(a,d) DROP(b,d),PUSH(b & a,d))
 94-	/* ORA */ OPC(0x1d,DROP(a,d) DROP(b,d),PUSH(b | a,d))
 95-	/* EOR */ OPC(0x1e,DROP(a,d) DROP(b,d),PUSH(b ^ a,d))
 96-	/* SFT */ OPC(0x1f,DROP(a,0) DROP(b,d),PUSH(b >> (a & 0xf) << (a >> 4),d))
 97+	switch(ram[pc++]) {
 98+	/* BRK */ case 0x00: return 1;
 99+	/* JCI */ case 0x20: if(DEC(0)) { IMM(c) pc += c; } else pc += 2; break;
100+	/* JMI */ case 0x40: IMM(c) pc += c; break;
101+	/* JSI */ case 0x60: IMM(c) INC(1) = pc >> 8, INC(1) = pc, pc += c; break;
102+	/* LI2 */ case 0xa0: INC(0) = ram[pc++]; /* fall-through */
103+	/* LIT */ case 0x80: INC(0) = ram[pc++]; break;
104+	/* L2r */ case 0xe0: INC(1) = ram[pc++]; /* fall-through */
105+	/* LIr */ case 0xc0: INC(1) = ram[pc++]; break;
106+	/* INC */ OPC(0x01,POx(a),PUx(a + 1))
107+	/* POP */ OPC(0x02,REM,{})
108+	/* NIP */ OPC(0x03,GOT(x) REM,PUT(x))
109+	/* SWP */ OPC(0x04,GOT(x) GOT(y),PUT(x) PUT(y))
110+	/* ROT */ OPC(0x05,GOT(x) GOT(y) GOT(z),PUT(y) PUT(x) PUT(z))
111+	/* DUP */ OPC(0x06,GOT(x),PUT(x) PUT(x))
112+	/* OVR */ OPC(0x07,GOT(x) GOT(y),PUT(y) PUT(x) PUT(y))
113+	/* EQU */ OPC(0x08,POx(a) POx(b),PU1(b == a))
114+	/* NEQ */ OPC(0x09,POx(a) POx(b),PU1(b != a))
115+	/* GTH */ OPC(0x0a,POx(a) POx(b),PU1(b > a))
116+	/* LTH */ OPC(0x0b,POx(a) POx(b),PU1(b < a))
117+	/* JMP */ OPC(0x0c,POx(a),MOV(a))
118+	/* JCN */ OPC(0x0d,POx(a) PO1(b),if(b) MOV(a))
119+	/* JSR */ OPC(0x0e,POx(a),RP1(pc >> 8) RP1(pc) MOV(a))
120+	/* STH */ OPC(0x0f,GOT(x),RP1(x[0]) if(_2) RP1(x[1]))
121+	/* LDZ */ OPC(0x10,PO1(a),PEK(a, x, 0xff))
122+	/* STZ */ OPC(0x11,PO1(a) GOT(y),POK(a, y, 0xff))
123+	/* LDR */ OPC(0x12,PO1(a),PEK(pc + (signed char)a, x, 0xffff))
124+	/* STR */ OPC(0x13,PO1(a) GOT(y),POK(pc + (signed char)a, y, 0xffff))
125+	/* LDA */ OPC(0x14,PO2(a),PEK(a, x, 0xffff))
126+	/* STA */ OPC(0x15,PO2(a) GOT(y),POK(a, y, 0xffff))
127+	/* DEI */ OPC(0x16,PO1(a),DEI(a, x))
128+	/* DEO */ OPC(0x17,PO1(a) GOT(y),DEO(a, y))
129+	/* ADD */ OPC(0x18,POx(a) POx(b),PUx(b + a))
130+	/* SUB */ OPC(0x19,POx(a) POx(b),PUx(b - a))
131+	/* MUL */ OPC(0x1a,POx(a) POx(b),PUx(b * a))
132+	/* DIV */ OPC(0x1b,POx(a) POx(b),PUx(a ? b / a : 0))
133+	/* AND */ OPC(0x1c,POx(a) POx(b),PUx(b & a))
134+	/* ORA */ OPC(0x1d,POx(a) POx(b),PUx(b | a))
135+	/* EOR */ OPC(0x1e,POx(a) POx(b),PUx(b ^ a))
136+	/* SFT */ OPC(0x1f,PO1(a) POx(b),PUx(b >> (a & 0xf) << (a >> 4)))
137 	}} return 0;
138 }
139

commit c01a35d

commit `c01a35d`