(uxn) Removed sp* indirection - pita/uxn12@f4d74dc

commit `f4d74dc`

Devine Lu Linvega · 2024-08-12 14:41:22 +0000 UTC

parent 90a5dad

(uxn) Removed sp* indirection

3 files changed, +45, -45

M src/uxn.c

M src/uxn11.c

M src/uxncli.c

M src/uxn.c

+43, -43

  1@@ -11,15 +11,15 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  2 WITH REGARD TO THIS SOFTWARE.
  3 */
  4 
  5-#define OPC(opc, body) {\
  6-	case 0x00|opc: {enum{_2=0,_r=0}; s = &uxn.wst, sp = &uxn.wst.ptr; body break;}\
  7-	case 0x20|opc: {enum{_2=1,_r=0}; s = &uxn.wst, sp = &uxn.wst.ptr; body break;}\
  8-	case 0x40|opc: {enum{_2=0,_r=1}; s = &uxn.rst, sp = &uxn.rst.ptr; body break;}\
  9-	case 0x60|opc: {enum{_2=1,_r=1}; s = &uxn.rst, sp = &uxn.rst.ptr; body break;}\
 10-	case 0x80|opc: {enum{_2=0,_r=0}; s = &uxn.wst, kp = uxn.wst.ptr, sp = &kp; body break;}\
 11-	case 0xa0|opc: {enum{_2=1,_r=0}; s = &uxn.wst, kp = uxn.wst.ptr, sp = &kp; body break;}\
 12-	case 0xc0|opc: {enum{_2=0,_r=1}; s = &uxn.rst, kp = uxn.rst.ptr, sp = &kp; body break;}\
 13-	case 0xe0|opc: {enum{_2=1,_r=1}; s = &uxn.rst, kp = uxn.rst.ptr, sp = &kp; body break;}\
 14+#define OPC(opc, init, body) {\
 15+	case 0x00|opc: {enum{_2=0,_r=0}; s = &uxn.wst; init; body; break;}\
 16+	case 0x20|opc: {enum{_2=1,_r=0}; s = &uxn.wst; init; body; break;}\
 17+	case 0x40|opc: {enum{_2=0,_r=1}; s = &uxn.rst; init; body; break;}\
 18+	case 0x60|opc: {enum{_2=1,_r=1}; s = &uxn.rst; init; body; break;}\
 19+	case 0x80|opc: {enum{_2=0,_r=0}; s = &uxn.wst, kp = uxn.wst.ptr; init; s->ptr = kp; body; break;}\
 20+	case 0xa0|opc: {enum{_2=1,_r=0}; s = &uxn.wst, kp = uxn.wst.ptr; init; s->ptr = kp; body; break;}\
 21+	case 0xc0|opc: {enum{_2=0,_r=1}; s = &uxn.rst, kp = uxn.rst.ptr; init; s->ptr = kp; body; break;}\
 22+	case 0xe0|opc: {enum{_2=1,_r=1}; s = &uxn.rst, kp = uxn.rst.ptr; init; s->ptr = kp; body; break;}\
 23 }
 24 
 25 /* Microcode */
 26@@ -28,8 +28,8 @@ WITH REGARD TO THIS SOFTWARE.
 27 #define JMI { pc += uxn.ram[pc++] << 8 | uxn.ram[pc++]; }
 28 #define JMP(x) { if(_2) pc = (x); else pc += (Sint8)(x); }
 29 #define POx(o) { if(_2) { PO2(o) } else PO1(o) }
 30-#define PO1(o) { o = s->dat[--*sp]; }
 31-#define PO2(o) { o = s->dat[--*sp] | (s->dat[--*sp] << 8); }
 32+#define PO1(o) { o = s->dat[--s->ptr]; }
 33+#define PO2(o) { o = s->dat[--s->ptr] | (s->dat[--s->ptr] << 8); }
 34 #define PUx(y) { if(_2) { PU2(y) } else PU1(y) }
 35 #define PU1(y) { s->dat[s->ptr++] = (y); }
 36 #define PU2(y) { tt = (y); PU1(tt >> 8) PU1(tt) }
 37@@ -43,7 +43,7 @@ int
 38 uxn_eval(Uint16 pc)
 39 {
 40 	int a,b,c;
 41-	Uint8 t, kp, *sp;
 42+	Uint8 t, kp;
 43 	Uint16 tt;
 44 	Stack *s;
 45 	if(!pc || uxn.dev[0x0f]) return 0;
 46@@ -57,37 +57,37 @@ uxn_eval(Uint16 pc)
 47 		/* LIT */ case 0x80: IMM(wst, uxn.ram[pc++]) break;
 48 		/* L2r */ case 0xe0: IMM(rst, uxn.ram[pc++])
 49 		/* LIr */ case 0xc0: IMM(rst, uxn.ram[pc++]) break;
 50-		/* INC */ OPC(0x01, POx(a) PUx(a + 1))
 51-		/* POP */ OPC(0x02, POx(a))
 52-		/* NIP */ OPC(0x03, POx(a) POx(b) PUx(a))
 53-		/* SWP */ OPC(0x04, POx(a) POx(b) PUx(a) PUx(b))
 54-		/* ROT */ OPC(0x05, POx(a) POx(b) POx(c) PUx(b) PUx(a) PUx(c))
 55-		/* DUP */ OPC(0x06, POx(a) PUx(a) PUx(a))
 56-		/* OVR */ OPC(0x07, POx(a) POx(b) PUx(b) PUx(a) PUx(b))
 57-		/* EQU */ OPC(0x08, POx(a) POx(b) PU1(b == a))
 58-		/* NEQ */ OPC(0x09, POx(a) POx(b) PU1(b != a))
 59-		/* GTH */ OPC(0x0a, POx(a) POx(b) PU1(b > a))
 60-		/* LTH */ OPC(0x0b, POx(a) POx(b) PU1(b < a))
 61-		/* JMP */ OPC(0x0c, POx(a) JMP(a))
 62-		/* JCN */ OPC(0x0d, POx(a) PO1(b) if(b) JMP(a))
 63-		/* JSR */ OPC(0x0e, POx(a) FLP PU2(pc) JMP(a))
 64-		/* STH */ OPC(0x0f, POx(a) FLP PUx(a))
 65-		/* LDZ */ OPC(0x10, PO1(a) PEK(b, a, t) PUx(b))
 66-		/* STZ */ OPC(0x11, PO1(a) POx(b) POK(a, b, t))
 67-		/* LDR */ OPC(0x12, PO1(a) PEK(b, pc + (Sint8)a, tt) PUx(b))
 68-		/* STR */ OPC(0x13, PO1(a) POx(b) POK(pc + (Sint8)a, b, tt))
 69-		/* LDA */ OPC(0x14, PO2(a) PEK(b, a, tt) PUx(b))
 70-		/* STA */ OPC(0x15, PO2(a) POx(b) POK(a, b, tt))
 71-		/* DEI */ OPC(0x16, PO1(a) DEI(a, b) PUx(b))
 72-		/* DEO */ OPC(0x17, PO1(a) POx(b) DEO(a, b))
 73-		/* ADD */ OPC(0x18, POx(a) POx(b) PUx(b + a))
 74-		/* SUB */ OPC(0x19, POx(a) POx(b) PUx(b - a))
 75-		/* MUL */ OPC(0x1a, POx(a) POx(b) PUx(b * a))
 76-		/* DIV */ OPC(0x1b, POx(a) POx(b) PUx(a ? b / a : 0))
 77-		/* AND */ OPC(0x1c, POx(a) POx(b) PUx(b & a))
 78-		/* ORA */ OPC(0x1d, POx(a) POx(b) PUx(b | a))
 79-		/* EOR */ OPC(0x1e, POx(a) POx(b) PUx(b ^ a))
 80-		/* SFT */ OPC(0x1f, PO1(a) POx(b) PUx(b >> (a & 0xf) << (a >> 4)))
 81+		/* INC */ OPC(0x01, POx(a), PUx(a + 1))
 82+		/* POP */ OPC(0x02, POx(a), 0)
 83+		/* NIP */ OPC(0x03, POx(a) POx(b), PUx(a))
 84+		/* SWP */ OPC(0x04, POx(a) POx(b), PUx(a) PUx(b))
 85+		/* ROT */ OPC(0x05, POx(a) POx(b) POx(c), PUx(b) PUx(a) PUx(c))
 86+		/* DUP */ OPC(0x06, POx(a), PUx(a) PUx(a))
 87+		/* OVR */ OPC(0x07, POx(a) POx(b), PUx(b) PUx(a) PUx(b))
 88+		/* EQU */ OPC(0x08, POx(a) POx(b), PU1(b == a))
 89+		/* NEQ */ OPC(0x09, POx(a) POx(b), PU1(b != a))
 90+		/* GTH */ OPC(0x0a, POx(a) POx(b), PU1(b > a))
 91+		/* LTH */ OPC(0x0b, POx(a) POx(b), PU1(b < a))
 92+		/* JMP */ OPC(0x0c, POx(a), JMP(a))
 93+		/* JCN */ OPC(0x0d, POx(a) PO1(b), if(b) JMP(a))
 94+		/* JSR */ OPC(0x0e, POx(a), FLP PU2(pc) JMP(a))
 95+		/* STH */ OPC(0x0f, POx(a), FLP PUx(a))
 96+		/* LDZ */ OPC(0x10, PO1(a), PEK(b, a, t) PUx(b))
 97+		/* STZ */ OPC(0x11, PO1(a) POx(b), POK(a, b, t))
 98+		/* LDR */ OPC(0x12, PO1(a), PEK(b, pc + (Sint8)a, tt) PUx(b))
 99+		/* STR */ OPC(0x13, PO1(a) POx(b), POK(pc + (Sint8)a, b, tt))
100+		/* LDA */ OPC(0x14, PO2(a), PEK(b, a, tt) PUx(b))
101+		/* STA */ OPC(0x15, PO2(a) POx(b), POK(a, b, tt))
102+		/* DEI */ OPC(0x16, PO1(a), DEI(a, b) PUx(b))
103+		/* DEO */ OPC(0x17, PO1(a) POx(b), DEO(a, b))
104+		/* ADD */ OPC(0x18, POx(a) POx(b), PUx(b + a))
105+		/* SUB */ OPC(0x19, POx(a) POx(b), PUx(b - a))
106+		/* MUL */ OPC(0x1a, POx(a) POx(b), PUx(b * a))
107+		/* DIV */ OPC(0x1b, POx(a) POx(b), PUx(a ? b / a : 0))
108+		/* AND */ OPC(0x1c, POx(a) POx(b), PUx(b & a))
109+		/* ORA */ OPC(0x1d, POx(a) POx(b), PUx(b | a))
110+		/* EOR */ OPC(0x1e, POx(a) POx(b), PUx(b ^ a))
111+		/* SFT */ OPC(0x1f, PO1(a) POx(b), PUx(b >> (a & 0xf) << (a >> 4)))
112 		}
113 	}
114 }

M src/uxn11.c

+1, -1

1@@ -267,7 +267,7 @@ main(int argc, char **argv)
2 	int i = 1;
3 	char *rom;
4 	if(i != argc && argv[i][0] == '-' && argv[i][1] == 'v') {
5-		fprintf(stdout, "Uxn11 - Varvara Emulator, 11 Aug 2024.\n");
6+		fprintf(stdout, "Uxn11 - Varvara Emulator, 12 Aug 2024.\n");
7 		i++;
8 	}
9 	rom = i == argc ? "boot.rom" : argv[i++];

M src/uxncli.c

+1, -1

1@@ -68,7 +68,7 @@ main(int argc, char **argv)
2 	int i = 1;
3 	char *rom;
4 	if(i != argc && argv[i][0] == '-' && argv[i][1] == 'v') {
5-		fprintf(stdout, "Uxncli - Console Varvara Emulator, 11 Aug 2024.\n");
6+		fprintf(stdout, "Uxncli - Console Varvara Emulator, 12 Aug 2024.\n");
7 		i++;
8 	}
9 	rom = i == argc ? "boot.rom" : argv[i++];

commit f4d74dc

commit `f4d74dc`