Housekeeping - pita/uxn12@d1268a8

commit `d1268a8`

Devine Lu Linvega · 2024-08-17 19:40:45 +0000 UTC

parent 3954e7b

Housekeeping

1 files changed, +34, -40

M src/uxn.c

+34, -40

  1@@ -16,49 +16,43 @@ WITH REGARD TO THIS SOFTWARE.
  2 	case 0x20|opc: {enum{_2=1,_r=0};init;body;} break;\
  3 	case 0x40|opc: {enum{_2=0,_r=1};init;body;} break;\
  4 	case 0x60|opc: {enum{_2=1,_r=1};init;body;} break;\
  5-	case 0x80|opc: {enum{_2=0,_r=0};k=uxn.wst.ptr;init;uxn.wst.ptr= k;body;} break;\
  6-	case 0xa0|opc: {enum{_2=1,_r=0};k=uxn.wst.ptr;init;uxn.wst.ptr= k;body;} break;\
  7-	case 0xc0|opc: {enum{_2=0,_r=1};k=uxn.rst.ptr;init;uxn.rst.ptr= k;body;} break;\
  8-	case 0xe0|opc: {enum{_2=1,_r=1};k=uxn.rst.ptr;init;uxn.rst.ptr= k;body;} break;\
  9+	case 0x80|opc: {enum{_2=0,_r=0};int k=uxn.wst.ptr;init;uxn.wst.ptr= k;body;} break;\
 10+	case 0xa0|opc: {enum{_2=1,_r=0};int k=uxn.wst.ptr;init;uxn.wst.ptr= k;body;} break;\
 11+	case 0xc0|opc: {enum{_2=0,_r=1};int k=uxn.rst.ptr;init;uxn.rst.ptr= k;body;} break;\
 12+	case 0xe0|opc: {enum{_2=1,_r=1};int k=uxn.rst.ptr;init;uxn.rst.ptr= k;body;} break;\
 13 }
 14 
 15 /* Microcode */
 16-
 17+#define JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++];
 18+#define JMP(i) if(_2) pc = (i); else pc += (Sint8)(i);
 19+/* stack-registers */
 20 #define REM if(_r) uxn.rst.ptr -= 1 + _2; else uxn.wst.ptr -= 1 + _2;
 21 #define INC(s) uxn.s.dat[uxn.s.ptr++]
 22 #define DEC(s) uxn.s.dat[--uxn.s.ptr]
 23 #define POP(o) if(_r) o = DEC(rst); else o = DEC(wst);
 24-#define PUx(y) if(_2) { tt = (y); PU1(tt >> 8) PU1(tt) } else PU1(y)
 25-#define PU1(y) if(_r) INC(rst) = y; else INC(wst) = y;
 26-#define PUR(y) if(_r) INC(wst) = y; else INC(rst) = y;
 27-#define PUT(y,z) PU1(y) if(_2) PU1(z)
 28-#define JMI pc += uxn.ram[pc++] << 8 | uxn.ram[pc++];
 29-#define JMP(j) if(_2) pc = (j); else pc += (Sint8)(j);
 30-#define DEI(i,o,p) o =emu_dei(i); if(_2) p =emu_dei(i + 1);
 31-#define DEO(i,y,z) emu_deo(i, y); if(_2) emu_deo(i + 1, z);
 32-#define PEK(i,o,p,r) o = uxn.ram[i]; if(_2) r = i + 1, p = uxn.ram[r];
 33-#define POK(i,y,z,r) uxn.ram[i] = y; if(_2) r = i + 1, uxn.ram[r] = z;
 34-
 35-/* stack-registers */
 36-
 37+#define PUx(i) if(_2) { tt = (i); PU1(tt >> 8) PU1(tt) } else PU1(i)
 38+#define PU1(i) if(_r) INC(rst) = i; else INC(wst) = i;
 39+#define RP1(i) if(_r) INC(wst) = i; else INC(rst) = i;
 40 #define A if(_2) { A2 } else A1
 41 #define A1 POP(a)
 42 #define A2 if(_r) a = DEC(rst) | (DEC(rst) << 8); else a = DEC(wst) | (DEC(wst) << 8);
 43 #define B if(_2) { B2 } else B1
 44 #define B1 POP(b)
 45 #define B2 if(_r) b = DEC(rst) | (DEC(rst) << 8); else b = DEC(wst) | (DEC(wst) << 8);
 46-
 47 /* memory-registers */
 48-
 49-#define X if(_2) POP(xx) POP(x)
 50-#define Y if(_2) POP(yy) POP(y)
 51-#define Z if(_2) POP(zz) POP(z)
 52+#define PUT(i) PU1(i[0]) if(_2) PU1(i[1])
 53+#define DEI(i,o) o[0] =emu_dei(i); if(_2) o[1] =emu_dei(i + 1);
 54+#define DEO(i,j) emu_deo(i, j[0]); if(_2) emu_deo(i + 1, j[1]);
 55+#define PEK(i,o,m) o[0] = uxn.ram[i]; if(_2) o[1] = uxn.ram[(i + 1) & m];
 56+#define POK(i,j,m) uxn.ram[i] = j[0]; if(_2) uxn.ram[(i + 1) & m] = j[1];
 57+#define X if(_2) POP(x[1]) POP(x[0])
 58+#define Y if(_2) POP(y[1]) POP(y[0])
 59+#define Z if(_2) POP(z[1]) POP(z[0])
 60 
 61 int
 62 uxn_eval(Uint16 pc)
 63 {
 64-	int a,b,c,x,xx,y,yy,z,zz,k;
 65-	Uint8 t;
 66+	int a,b,x[2],y[2],z[2];
 67 	Uint16 tt;
 68 	if(!pc || uxn.dev[0x0f]) return 0;
 69 	for(;;) {
 70@@ -73,27 +67,27 @@ uxn_eval(Uint16 pc)
 71 		/* LIr */ case 0xc0: INC(rst) = uxn.ram[pc++]; break;
 72 		/* INC */ OPC(0x01, A, PUx(a + 1))
 73 		/* POP */ OPC(0x02, REM, 0)
 74-		/* NIP */ OPC(0x03, X REM, PUT(x,xx))
 75-		/* SWP */ OPC(0x04, X Y, PUT(x,xx) PUT(y,yy))
 76-		/* ROT */ OPC(0x05, X Y Z, PUT(y,yy) PUT(x,xx) PUT(z,zz))
 77-		/* DUP */ OPC(0x06, X, PUT(x,xx) PUT(x,xx))
 78-		/* OVR */ OPC(0x07, X Y, PUT(y,yy) PUT(x,xx) PUT(y,yy))
 79+		/* NIP */ OPC(0x03, X REM, PUT(x))
 80+		/* SWP */ OPC(0x04, X Y, PUT(x) PUT(y))
 81+		/* ROT */ OPC(0x05, X Y Z, PUT(y) PUT(x) PUT(z))
 82+		/* DUP */ OPC(0x06, X, PUT(x) PUT(x))
 83+		/* OVR */ OPC(0x07, X Y, PUT(y) PUT(x) PUT(y))
 84 		/* EQU */ OPC(0x08, A B, PU1(b == a))
 85 		/* NEQ */ OPC(0x09, A B, PU1(b != a))
 86 		/* GTH */ OPC(0x0a, A B, PU1(b > a))
 87 		/* LTH */ OPC(0x0b, A B, PU1(b < a))
 88 		/* JMP */ OPC(0x0c, A, JMP(a))
 89 		/* JCN */ OPC(0x0d, A B1, if(b) JMP(a))
 90-		/* JSR */ OPC(0x0e, A, PUR(pc >> 8) PUR(pc) JMP(a))
 91-		/* STH */ OPC(0x0f, X, PUR(x) if(_2) PUR(xx))
 92-		/* LDZ */ OPC(0x10, A1, PEK(a,x,xx,t) PUT(x,xx))
 93-		/* STZ */ OPC(0x11, A1 Y, POK(a,y,yy,t))
 94-		/* LDR */ OPC(0x12, A1, PEK(pc+(Sint8)a,x,xx,tt) PUT(x,xx))
 95-		/* STR */ OPC(0x13, A1 Y, POK(pc+(Sint8)a,y,yy,tt))
 96-		/* LDA */ OPC(0x14, A2, PEK(a,x,xx,tt) PUT(x,xx))
 97-		/* STA */ OPC(0x15, A2 Y, POK(a,y,yy,tt))
 98-		/* DEI */ OPC(0x16, A1, DEI(a,x,xx) PUT(x,xx))
 99-		/* DEO */ OPC(0x17, A1 Y, DEO(a,y,yy))
100+		/* JSR */ OPC(0x0e, A, RP1(pc >> 8) RP1(pc) JMP(a))
101+		/* STH */ OPC(0x0f, X, RP1(x[0]) if(_2) RP1(x[1]))
102+		/* LDZ */ OPC(0x10, A1, PEK(a, x, 0xff) PUT(x))
103+		/* STZ */ OPC(0x11, A1 Y, POK(a, y, 0xff))
104+		/* LDR */ OPC(0x12, A1, PEK(pc+(Sint8)a, x, 0xffff) PUT(x))
105+		/* STR */ OPC(0x13, A1 Y, POK(pc+(Sint8)a, y, 0xffff))
106+		/* LDA */ OPC(0x14, A2, PEK(a, x, 0xffff) PUT(x))
107+		/* STA */ OPC(0x15, A2 Y, POK(a, y, 0xffff))
108+		/* DEI */ OPC(0x16, A1, DEI(a, x) PUT(x))
109+		/* DEO */ OPC(0x17, A1 Y, DEO(a, y))
110 		/* ADD */ OPC(0x18, A B, PUx(b + a))
111 		/* SUB */ OPC(0x19, A B, PUx(b - a))
112 		/* MUL */ OPC(0x1a, A B, PUx(b * a))

commit d1268a8

commit `d1268a8`