7 files changed, 65 insertions(+), 64 deletions(-)

R src/main-old.c => old/main-old.c
R src/devices/screen.c => old/screen.c
R src/devices/screen.h => old/screen.h
M src/devices/ppu.c
M src/devices/ppu.h
M src/main.c
M src/uxn.c

@@ 1,6 1,5 @@
 /*
-Copyright (c) 2021 Devine Lu Linvega
-Copyright (c) 2021 Andrew Alderwick
+Copyright (c) 2021 Andrew Alderwick, Devine Lu Linvega
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above


@@ 46,7 45,7 @@ render_all(Ppu *p)
 void
 ppu_pixel(Ppu *p, uint8_t layer, uint16_t x, uint16_t y, uint8_t color)
 {
-	if(x >= WIDTH_PIXELS || y >= HEIGHT) return;
+	if(x >= WIDTH || y >= HEIGHT) return;
 	int offset = y * STRIDE_WORDS + x / 32;
 	uint32_t *px = &p->pixels[offset * 3 + layer];
 	uint32_t mask = 1 << ((x & 0x18) + (7 - (x & 0x7)));

@@ 1,6 1,5 @@
 /*
-Copyright (c) 2021 Devine Lu Linvega
-Copyright (c) 2021 Andrew Alderwick
+Copyright (c) 2021 Andrew Alderwick, Devine Lu Linvega
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above


@@ 12,10 11,11 @@ WITH REGARD TO THIS SOFTWARE.
 
 #include <stdint.h>
 
-#define WIDTH_PIXELS 400
+#define WIDTH 400
+#define HEIGHT 240
+
 #define STRIDE_PIXELS (52 * 8)
 #define STRIDE_WORDS (STRIDE_PIXELS / 32)
-#define HEIGHT 240
 
 /*
  * framebuffer is the Playdate's raw framebuffer.

@@ 267,7 267,6 @@ update_controller(lua_State *L)
 		u.dev[0x82] = state;
 		uxn_eval(&u, GETVEC(&u.dev[0x80]));
 	}
-
 	// Crank
 	unsigned char crank = pd->system->getCrankChange();
 	if(crank) {


@@ 275,7 274,6 @@ update_controller(lua_State *L)
 		uxn_eval(&u, GETVEC(&u.dev[0x90]));
 		u.dev[0x9d] = 0x00;
 	}
-
 	return 0;
 }
 static int

@@ 11,84 11,88 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE.
 */
 
-/*	a,b,c: general use.  bs: byte/short bool. src, dst: stack ptrs, swapped in return mode.
-	pc: program counter. sp: ptr to src stack ptr. kptr: "keep" mode copy of src stack ptr.
-	x,y: macro in params. d: macro in device. j: macro temp variables. o: macro out param. */
+/*	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. */
 
 #define HALT(c) { return uxn_halt(u, instr, (c), pc - 1); }
-#define JUMP(x) { if(bs) pc = (x); else pc += (Sint8)(x); }
-#define PUSH8(s, x) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (x); }
-#define PUSH16(s, x) { if((j = s->ptr) >= 0xfe) HALT(2) k = (x); s->dat[j] = k >> 8; s->dat[j + 1] = k; s->ptr = j + 2; }
-#define PUSH(s, x) { if(bs) { PUSH16(s, (x)) } else { PUSH8(s, (x)) } }
-#define POP8(o) { if(!(j = *sp)) HALT(1) o = (Uint16)src->dat[--j]; *sp = j; }
-#define POP16(o) { if((j = *sp) <= 1) HALT(1) o = (src->dat[j - 2] << 8) + src->dat[j - 1]; *sp = j - 2; }
-#define POP(o) { if(bs) { POP16(o) } else { POP8(o) } }
-#define POKE(x, y) { if(bs) { u->ram[(x)] = (y) >> 8; u->ram[(x) + 1] = (y); } else { u->ram[(x)] = y; } }
-#define PEEK16(o, x) { o = (u->ram[(x)] << 8) + u->ram[(x) + 1]; }
-#define PEEK(o, x) { if(bs) PEEK16(o, x) else o = u->ram[(x)]; }
-#define DEVR(o, x) { o = u->dei(u, x); if (bs) o = (o << 8) + u->dei(u, (x) + 1); }
-#define DEVW(x, y) { if (bs) { u->deo(u, (x), (y) >> 8); u->deo(u, (x) + 1, (y)); } else { u->deo(u, x, (y)); } }
+#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); s->dat[tsp] = t >> 8; s->dat[tsp + 1] = 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 = s->dat[tsp - 1] | (s->dat[tsp - 2] << 8); *sp = tsp - 2; }
+#define POP(o) { if(m2) { POP16(o) } else { POP8(o) } }
+
+#define POKE(x, y) { if(m2) { t = (y); u->ram[(x)] = t >> 8; u->ram[(x) + 1] = t; } else { u->ram[(x)] = (y); } }
+#define PEEK16(o, x) { o = (u->ram[(x)] << 8) | u->ram[(x) + 1]; }
+#define PEEK(o, x) { if(m2) PEEK16(o, 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)); } }
 
 int
 uxn_eval(Uxn *u, Uint16 pc)
 {
-	Uint8 kptr, *sp;
-	Uint16 a, b, c, j, k, bs, instr, opcode;
-	Stack *src, *dst;
+	Uint8 instr, opcode, m2, ksp, tsp, *sp;
+	Uint16 a, b, c, t;
+	Stack *s;
 	if(!pc || u->dev[0x0f]) return 0;
 	for(;;) {
 		instr = u->ram[pc++];
+		opcode = instr & 0x1f;
+		/* Short Mode */
+		m2 = instr & 0x20;
 		/* Return Mode */
-		if(instr & 0x40) { src = u->rst; dst = u->wst; }
-		else { src = u->wst; dst = u->rst; }
+		s = instr & 0x40 ? u->rst : u->wst;
 		/* Keep Mode */
-		if(instr & 0x80) { kptr = src->ptr; sp = &kptr; }
-		else sp = &src->ptr;
-		/* Short Mode */
-		bs = instr & 0x20;
-		opcode = instr & 0x1f;
+		if(instr & 0x80) { ksp = s->ptr; sp = &ksp; }
+		else sp = &s->ptr;
+		/* Opcodes */
 		switch(opcode - (!opcode * (instr >> 5))) {
-		/* Literals/Calls */
+		/* Immediate */
 		case -0x0: /* BRK */ return 1;
 		case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; }
 		case -0x2: /* JMI */ PEEK16(a, pc) pc += a + 2; break;
-		case -0x3: /* JSI */ PUSH16(u->rst, pc + 2) PEEK16(a, pc) pc += a + 2; break;
+		case -0x3: /* JSI */ s = u->rst; PUSH16(pc + 2) PEEK16(a, pc) pc += a + 2; break;
 		case -0x4: /* LIT */
-		case -0x6: /* LITr */ a = u->ram[pc++]; PUSH8(src, a) break;
+		case -0x6: /* LITr */ a = u->ram[pc++]; PUSH8(a) break;
 		case -0x5: /* LIT2 */
-		case -0x7: /* LIT2r */ PEEK16(a, pc) PUSH16(src, a) pc += 2; break;
+		case -0x7: /* LIT2r */ PEEK16(a, pc) PUSH16(a) pc += 2; break;
 		/* ALU */
-		case 0x01: /* INC */ POP(a) PUSH(src, a + 1) break;
+		case 0x01: /* INC */ POP(a) PUSH(a + 1) break;
 		case 0x02: /* POP */ POP(a) break;
-		case 0x03: /* NIP */ POP(a) POP(b) PUSH(src, a) break;
-		case 0x04: /* SWP */ POP(a) POP(b) PUSH(src, a) PUSH(src, b) break;
-		case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(src, b) PUSH(src, a) PUSH(src, c) break;
-		case 0x06: /* DUP */ POP(a) PUSH(src, a) PUSH(src, a) break;
-		case 0x07: /* OVR */ POP(a) POP(b) PUSH(src, b) PUSH(src, a) PUSH(src, b) break;
-		case 0x08: /* EQU */ POP(a) POP(b) PUSH8(src, b == a) break;
-		case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(src, b != a) break;
-		case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(src, b > a) break;
-		case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(src, b < 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) PUSH16(dst, pc) JUMP(a) break;
-		case 0x0f: /* STH */ POP(a) PUSH(dst, a) break;
-		case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(src, b) 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) b = pc + (Sint8)a; PEEK(c, b) PUSH(src, c) break;
-		case 0x13: /* STR */ POP8(a) POP(b) c = pc + (Sint8)a; POKE(c, b) break;
-		case 0x14: /* LDA */ POP16(a) PEEK(b, a) PUSH(src, 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(src, 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(src, b + a) break;
-		case 0x19: /* SUB */ POP(a) POP(b) PUSH(src, b - a) break;
-		case 0x1a: /* MUL */ POP(a) POP(b) PUSH(src, (Uint32)b * a) break;
-		case 0x1b: /* DIV */ POP(a) POP(b) if(!a) HALT(3) PUSH(src, b / a) break;
-		case 0x1c: /* AND */ POP(a) POP(b) PUSH(src, b & a) break;
-		case 0x1d: /* ORA */ POP(a) POP(b) PUSH(src, b | a) break;
-		case 0x1e: /* EOR */ POP(a) POP(b) PUSH(src, b ^ a) break;
-		case 0x1f: /* SFT */ POP8(a) POP(b) PUSH(src, b >> (a & 0x0f) << ((a & 0xf0) >> 4)) 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;
 		}
 	}
 }


@@ 107,4 111,4 @@ uxn_boot(Uxn *u, Uint8 *ram, Dei *dei, Deo *deo)
 	u->dei = dei;
 	u->deo = deo;
 	return 1;
-}>
\ No newline at end of file
+}