~rabbits/uxn-playdate: Using new core

4 files changed, 125 insertions(+), 73 deletions(-)

M Makefile
M build.sh
M src/main.c
M src/uxn.c

M Makefile => Makefile +1 -1

@@ 32,7 32,7 @@ UINCDIR =
 UASRC = 
 
 # List all user C define here, like -D_DEBUG=1
-UDEFS = 
+UDEFS =
 
 # Define ASM defines here
 UADEFS =

M build.sh => build.sh +1 -1

@@ 1,6 1,6 @@
 #!/bin/sh -e
 
-export PLAYDATE_SDK_PATH="/home/neauoire/Documents/playdate/PlaydateSDK-1.13.0"
+export PLAYDATE_SDK_PATH="/home/neauoire/Documents/playdate/PlaydateSDK-1.13.1"
 TARGET="etc/wireworld.tal"
 
 rm -rf bin

M src/main.c => src/main.c +0 -1

@@ 110,7 110,6 @@ static void
 emu_deo(Uxn *u, Uint8 addr, Uint8 v)
 {
 	Uint8 *d = &u->dev[addr & 0xf0];
-	u->dev[addr] = v;
 	switch(addr) {
 	/* system */
 	case 0x03: system_cmd(u->ram, PEEK16(d + 0x2)); break;

M src/uxn.c => src/uxn.c +123 -70

@@ 11,85 11,138 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE.
 */
 
-/*	a,b,c: general use. m2: byte/short mode flag.
-	tsp: macro temp stack ptr. ksp: "keep" mode copy of stack ptr. sp: ptr to stack ptr.
-	x,y: macro in params. o: macro out param. */
+/* Registers
 
-#define HALT(c) { return uxn_halt(u, instr, (c), pc - 1); }
-#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
-#define PUSH8(x) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (x); }
-#define PUSH16(x) { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (x); POKE16(&s->dat[tsp], t); s->ptr = tsp + 2; }
-#define PUSH(x) { if(m2) { PUSH16(x) } else { PUSH8(x) } }
-#define POP8(o) { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
-#define POP16(o) { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK16(&s->dat[tsp - 2]); *sp = tsp - 2; }
-#define POP(o) { if(m2) { POP16(o) } else { POP8(o) } }
-#define POKE(x, y) { if(m2) { t = (y); POKE16(u->ram + x, t) } else { u->ram[(x)] = (y); } }
-#define PEEK(o, x) { if(m2) { o = PEEK16(u->ram + x); } else o = u->ram[(x)]; }
-#define DEVR(o, x) { o = u->dei(u, x); if(m2) o = (o << 8) | u->dei(u, (x) + 1); }
-#define DEVW(x, y) { if(m2) { u->deo(u, (x), (y) >> 8); u->deo(u, (x) + 1, (y)); } else { u->deo(u, x, (y)); } }
+[ . ][ . ][ . ][ L ][ N ][ T ] <
+[ . ][ . ][ . ][   H2   ][ T ] <
+[   L2   ][   N2   ][   T2   ] <
+
+*/
+
+#define T s->dat[s->ptr-1]
+#define N s->dat[s->ptr-2]
+#define L s->dat[s->ptr-3]
+#define H2 PEEK16(s->dat+s->ptr-3)
+#define T2 PEEK16(s->dat+s->ptr-2)
+#define N2 PEEK16(s->dat+s->ptr-4)
+#define L2 PEEK16(s->dat+s->ptr-6)
+
+#define HALT(c) { return uxn_halt(u, ins, (c), pc - 1); }
+#define INC(mul, add) { if(mul > s->ptr) HALT(1) s->ptr += k * mul + add; if(s->ptr > 255) HALT(2) }
+#define DEC(mul, sub) { if(mul > s->ptr) HALT(1) s->ptr -= !k * mul - sub; if(s->ptr > 255) HALT(2) }
+#define PUT(o, v) { s->dat[s->ptr - o - 1] = (v); }
+#define PUT2(o, v) { tmp = (v); s->dat[s->ptr - o - 2] = tmp >> 8; s->dat[s->ptr - o - 1] = tmp; }
+#define PUSH(stack, v) { stack->dat[stack->ptr++] = (v); }
+#define PUSH2(stack, v) { tmp = (v); stack->dat[stack->ptr] = (v) >> 8; stack->dat[stack->ptr + 1] = (v); stack->ptr += 2; }
+#define SEND(a, b) { u->dev[a] = b; if((callbacks[(a) >> 4] >> ((a) & 0xf)) & 0x1) u->deo(u, a, b); }
+
+static 
+Uint16 callbacks[] = {
+        0xffff, /* 00 system */
+        0xffff, /* 10 console */
+        0xc028, /* 20 screen */
+        0x8000, /* 30 audio 0 */
+        0x8000, /* 40 audio 1 */
+        0x8000, /* 50 audio 2 */
+        0x8000, /* 60 audio 3 */
+        0x0000, /* 70 midi */
+        0x0000, /* 80 mouse */
+        0x0000, /* 90 controller*/
+        0xa260, /* a0 file 0 */
+        0xa260, /* b0 file 1 */
+        0xffff, /* c0 datetime */
+        0x0000, /* d0 empty */
+        0x0000, /* e0 empty */
+        0x0000  /* f0 empty */
+};
 
 int
 uxn_eval(Uxn *u, Uint16 pc)
 {
-	Uint8 instr, opcode, m2, ksp, tsp, *sp;
-	Uint16 a, b, c, t;
+	Uint8 ins, opc, k;
+	Uint16 t, n, l, tmp;
 	Stack *s;
 	if(!pc || u->dev[0x0f]) return 0;
 	for(;;) {
-		instr = u->ram[pc++];
-		opcode = instr & 0x1f;
-		/* Short Mode */
-		m2 = instr & 0x20;
-		/* Return Mode */
-		s = instr & 0x40 ? u->rst : u->wst;
-		/* Keep Mode */
-		if(instr & 0x80) { ksp = s->ptr; sp = &ksp; }
-		else sp = &s->ptr;
-		/* Opcodes */
-		switch(opcode - (!opcode * (instr >> 5))) {
-		/* Immediate */
-		case -0x0: /* BRK */ return 1;
-		case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; }
-		case -0x2: /* JMI */ pc += PEEK16(u->ram + pc) + 2; break;
-		case -0x3: /* JSI */ s = u->rst; PUSH16(pc + 2) pc += PEEK16(u->ram + pc) + 2; break;
-		case -0x4: /* LIT */
-		case -0x6: /* LITr */ a = u->ram[pc++]; PUSH8(a) break;
-		case -0x5: /* LIT2 */
-		case -0x7: /* LIT2r */ PUSH16(PEEK16(u->ram + pc)) pc += 2; break;
-		/* ALU */
-		case 0x01: /* INC */ POP(a) PUSH(a + 1) break;
-		case 0x02: /* POP */ POP(a) break;
-		case 0x03: /* NIP */ POP(a) POP(b) PUSH(a) break;
-		case 0x04: /* SWP */ POP(a) POP(b) PUSH(a) PUSH(b) break;
-		case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(b) PUSH(a) PUSH(c) break;
-		case 0x06: /* DUP */ POP(a) PUSH(a) PUSH(a) break;
-		case 0x07: /* OVR */ POP(a) POP(b) PUSH(b) PUSH(a) PUSH(b) break;
-		case 0x08: /* EQU */ POP(a) POP(b) PUSH8(b == a) break;
-		case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(b != a) break;
-		case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(b > a) break;
-		case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(b < a) break;
-		case 0x0c: /* JMP */ POP(a) JUMP(a) break;
-		case 0x0d: /* JCN */ POP(a) POP8(b) if(b) JUMP(a) break;
-		case 0x0e: /* JSR */ POP(a) s = (instr & 0x40) ? u->wst : u->rst; PUSH16(pc) JUMP(a) break;
-		case 0x0f: /* STH */ POP(a) s = (instr & 0x40) ? u->wst : u->rst; PUSH(a) break;
-		case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(b) break;
-		case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break;
-		case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(b) break;
-		case 0x13: /* STR */ POP8(a) POP(b) POKE(pc + (Sint8)a, b) break;
-		case 0x14: /* LDA */ POP16(a) PEEK(b, a) PUSH(b) break;
-		case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) break;
-		case 0x16: /* DEI */ POP8(a) DEVR(b, a) PUSH(b) break;
-		case 0x17: /* DEO */ POP8(a) POP(b) DEVW(a, b) break;
-		case 0x18: /* ADD */ POP(a) POP(b) PUSH(b + a) break;
-		case 0x19: /* SUB */ POP(a) POP(b) PUSH(b - a) break;
-		case 0x1a: /* MUL */ POP(a) POP(b) PUSH((Uint32)b * a) break;
-		case 0x1b: /* DIV */ POP(a) POP(b) if(!a) HALT(3) PUSH(b / a) break;
-		case 0x1c: /* AND */ POP(a) POP(b) PUSH(b & a) break;
-		case 0x1d: /* ORA */ POP(a) POP(b) PUSH(b | a) break;
-		case 0x1e: /* EOR */ POP(a) POP(b) PUSH(b ^ a) break;
-		case 0x1f: /* SFT */ POP8(a) POP(b) PUSH(b >> (a & 0x0f) << ((a & 0xf0) >> 4)) break;
+		ins = u->ram[pc++];
+		k = !!(ins & 0x80);
+		s = ins & 0x40 ? u->rst : u->wst;
+		opc = !(ins & 0x1f) ? 0 - (ins >> 5) : ins & 0x3f;
+		switch(opc) {
+			/* IMM */
+			case 0x00: /* BRK   */ return 1;
+			case 0xff: /* JCI   */ pc += !!s->dat[--s->ptr] * PEEK16(u->ram + pc) + 2; break;
+			case 0xfe: /* JMI   */ pc += PEEK16(u->ram + pc) + 2; break;
+			case 0xfd: /* JSI   */ PUSH2(u->rst, pc + 2); pc += PEEK16(u->ram + pc) + 2; break;
+			case 0xfc: /* LIT   */ PUSH(u->wst, u->ram[pc++]); break;
+			case 0xfb: /* LIT2  */ PUSH2(u->wst, PEEK16(u->ram + pc)); pc += 2; break;
+			case 0xfa: /* LITr  */ PUSH(u->rst, u->ram[pc++]); break;
+			case 0xf9: /* LIT2r */ PUSH2(u->rst, PEEK16(u->ram + pc)); pc += 2; break;
+			/* ALU */
+			case 0x21: /* INC2 */ t=T2;           INC(2, 0) PUT2(0, t + 1) break;                              
+			case 0x01: /* INC  */ t=T;            INC(1, 0) PUT(0, t + 1); break; 
+			case 0x22: /* POP2 */                 DEC(2, 0) break;                                                     
+			case 0x02: /* POP  */                 DEC(1, 0) break; 
+			case 0x23: /* NIP2 */ t=T2;           DEC(2, 0) PUT2(0, t) break;                                 
+			case 0x03: /* NIP  */ t=T;            DEC(1, 0) PUT(0, t) break; 
+			case 0x24: /* SWP2 */ t=T2;n=N2;      INC(4, 0) PUT2(2, t) PUT2(0, n); break;             
+			case 0x04: /* SWP  */ t=T;n=N;        INC(2, 0) PUT(0, n) PUT(1, t); break; 
+			case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; INC(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break; 
+			case 0x05: /* ROT  */ t=T;n=N;l=L;    INC(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break; 
+			case 0x26: /* DUP2 */ t=T2;           INC(2, 2) PUT2(0, t) PUT2(2, t) break;                     
+			case 0x06: /* DUP  */ t=T;            INC(1, 1) PUT(0, t) PUT(1, t) break; 
+			case 0x27: /* OVR2 */ t=T2;n=N2;      INC(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break; 
+			case 0x07: /* OVR  */ t=T;n=N;        INC(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break; 
+			case 0x28: /* EQU2 */ t=T2;n=N2;      INC(4,-3) PUT(0, n == t) break;                    
+			case 0x08: /* EQU  */ t=T;n=N;        INC(2,-1) PUT(0, n == t) break; 
+			case 0x29: /* NEQ2 */ t=T2;n=N2;      INC(4,-3) PUT(0, n != t) break;                    
+			case 0x09: /* NEQ  */ t=T;n=N;        INC(2,-1) PUT(0, n != t) break; 
+			case 0x2a: /* GTH2 */ t=T2;n=N2;      INC(4,-3) PUT(0, n > t)  break;                    
+			case 0x0a: /* GTH  */ t=T;n=N;        INC(2,-1) PUT(0, n > t) break; 
+			case 0x2b: /* LTH2 */ t=T2;n=N2;      INC(4,-3) PUT(0, n < t)  break;                    
+			case 0x0b: /* LTH  */ t=T;n=N;        INC(2,-1) PUT(0, n < t) break; 
+			case 0x2c: /* JMP2 */ t=T2;           DEC(2, 0) pc = t; break;                                      
+			case 0x0c: /* JMP  */ t=T;            DEC(1, 0) pc += (Sint8)(t);  break; 
+			case 0x2d: /* JCN2 */ t=T2;n=L;       DEC(3, 0) if(n) { pc = t; } break;                    
+			case 0x0d: /* JCN  */ t=T;n=N;        DEC(2, 0) pc += !!n * (Sint8)t; break; 
+			case 0x2e: /* JSR2 */ t=T2;           DEC(2, 0) PUSH2(u->rst, pc) pc = t; break;                 
+			case 0x0e: /* JSR  */ t=T;            DEC(1, 0) PUSH2(u->rst, pc) pc += (Sint8)t; break;
+			case 0x2f: /* STH2 */ t=T2; if(ins & 0x40) { u->rst->ptr -= !k * 2; PUSH2(u->wst, t); } else{ u->wst->ptr -= !k * 2; PUSH2(u->rst, t); } break; 
+			case 0x0f: /* STH  */ t=T;  if(ins & 0x40) { u->rst->ptr -= !k; PUSH(u->wst, t); } else{ u->wst->ptr -= !k; PUSH(u->rst, t); } break; 
+			case 0x30: /* LDZ2 */ t=T;            INC(1, 1) PUT2(0, PEEK16(u->ram + t)) break;                       
+			case 0x10: /* LDZ  */ t=T;            INC(1, 0) PUT(0, u->ram[t]) break; 
+			case 0x31: /* STZ2 */ t=T;n=H2;       DEC(3, 0) POKE16(u->ram + t, n) break;                     
+			case 0x11: /* STZ  */ t=T;n=N;        DEC(2, 0) u->ram[t] = n; break; 
+			case 0x32: /* LDR2 */ t=T;            INC(1, 1) PUT2(0, PEEK16(u->ram + pc + (Sint8)t)) break;           
+			case 0x12: /* LDR  */ t=T;            INC(1, 0) PUT(0, u->ram[pc + (Sint8)t]) break;
+			case 0x33: /* STR2 */ t=T;n=H2;       DEC(3, 0) POKE16(u->ram + pc + (Sint8)t, n) break;         
+			case 0x13: /* STR  */ t=T;n=N;        DEC(2, 0) u->ram[pc + (Sint8)t] = n; break; 
+			case 0x34: /* LDA2 */ t=T2;           INC(2, 0) PUT2(0, PEEK16(u->ram + t)) break;                      
+			case 0x14: /* LDA  */ t=T2;           INC(2,-1) PUT(0, u->ram[t]) break;
+			case 0x35: /* STA2 */ t=T2;n=N2;      DEC(4, 0) POKE16(u->ram + t, n) break;                    
+			case 0x15: /* STA  */ t=T2;n=L;       DEC(3, 0) u->ram[t] = n; break; 
+			case 0x36: /* DEI2 */ t=T;            INC(1, 1) PUT(1, u->dei(u, t)) PUT(0, u->dei(u, t + 1)) break;      
+			case 0x16: /* DEI  */ t=T;            INC(1, 0) PUT(0, u->dei(u, t)) break;
+			case 0x37: /* DEO2 */ t=T;n=N;l=L;    DEC(3, 0) SEND(t, l) SEND(t + 1, n) break; 
+			case 0x17: /* DEO  */ t=T;n=N;        DEC(2, 0) SEND(t, n) break; 
+			case 0x38: /* ADD2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n + t) break; 
+			case 0x18: /* ADD  */ t=T;n=N;        INC(2,-1) PUT(0, n + t) break;
+			case 0x39: /* SUB2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n - t) break; 
+			case 0x19: /* SUB  */ t=T;n=N;        INC(2,-1) PUT(0, n - t) break;
+			case 0x3a: /* MUL2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n * t) break; 
+			case 0x1a: /* MUL  */ t=T;n=N;        INC(2,-1) PUT(0, n * t) break;
+			case 0x3b: /* DIV2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n / t) break; 
+			case 0x1b: /* DIV  */ t=T;n=N;        INC(2,-1) PUT(0, n / t) break;
+			case 0x3c: /* AND2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n & t) break; 
+			case 0x1c: /* AND  */ t=T;n=N;        INC(2,-1) PUT(0, n & t) break;
+			case 0x3d: /* ORA2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n | t) break; 
+			case 0x1d: /* ORA  */ t=T;n=N;        INC(2,-1) PUT(0, n | t) break;
+			case 0x3e: /* EOR2 */ t=T2;n=N2;      INC(4,-2) PUT2(0, n ^ t) break; 
+			case 0x1e: /* EOR  */ t=T;n=N;        INC(2,-1) PUT(0, n ^ t) break;
+			case 0x3f: /* SFT2 */ t=T;n=H2;       INC(3,-1) PUT2(0, n >> (t & 0x0f) << ((t & 0xf0) >> 4)) break;
+			case 0x1f: /* SFT  */ t=T;n=N;        INC(2,-1) PUT(0, n >> (t & 0x0f) << ((t & 0xf0) >> 4)) break;
 		}
-	}
+	}		
 }
 
 int