commit 21dfea7

(uxn.c) Cleanup

 1@@ -75,24 +75,25 @@
 2 		> Storing 12 in 0xffff, and 34 in 0x0000 )
 3 
 4 	#1234 #ffff STA2
 5-	#ffff LDA #0000 LDA ADD #46 EQU
 6-	#ffff LDA2 ADD #46 EQU
 7+	( LDA ) #0000 LDA #ffff LDA ADD #46 EQU
 8+	( LDA2 ) #ffff LDA2 ADD #46 EQU
 9 	AND ;Dict/ram-wrap test-part
10 
11 	( Part 9
12 		> Testing that zero-page is wrapping )
13 
14-	#0000 STZ #00ff STZ
15-	#1234 #ff STZ2
16-	#00ff LDA #0000 LDA ADD #46 EQU
17-	;Dict/zp-wrap test-part
18+	#5678 #ff STZ2
19+	( LDZ ) #00 LDZ #ff LDZ ADD #ce EQU
20+	( LDZ2 ) #ff LDZ2 ADD #ce EQU
21+	AND ;Dict/zp-wrap test-part
22 
23 	( Part 10
24 		> Testing that device page is wrapping )
25 
26 	#1234 #ff DEO2
27-	#ff DEI #00 DEI ADD #46 EQU
28-	;Dict/dev-wrap test-part
29+	( DEI ) #00 DEI #ff DEI ADD #46 EQU
30+	( DEI2 ) #ff DEI2 ADD #46 EQU
31+	AND ;Dict/dev-wrap test-part
32 	#0000 DEO #00ff DEO
33 
34 	( end )

 1@@ -13,14 +13,14 @@ WITH REGARD TO THIS SOFTWARE.
 2 
 3 #define FLIP     { s = ins & 0x40 ? &u->wst : &u->rst; }
 4 #define JUMP(x)  { if(m2) pc = (x); else pc += (Sint8)(x); }
 5-#define PUSH1(y) { s->dat[s->ptr++] = (y); }
 6-#define PUSH2(y) { tt = (y); s->dat[s->ptr++] = tt >> 0x8; s->dat[s->ptr++] = tt; }
 7-#define PUSHx(y) { if(m2) { PUSH2(y) } else PUSH1(y) }
 8 #define POP1(o)  { o = s->dat[--*sp]; }
 9 #define POP2(o)  { o = s->dat[--*sp] | (s->dat[--*sp] << 0x8); }
10 #define POPx(o)  { if(m2) { POP2(o) } else POP1(o) }
11-#define POKE(x, y, r) { if(m2) { r = (x); ram[r++] = y >> 8; ram[r] = y; } else ram[(x)] = (y); }
12+#define PUSH1(y) { s->dat[s->ptr++] = (y); }
13+#define PUSH2(y) { tt = (y); s->dat[s->ptr++] = tt >> 0x8; s->dat[s->ptr++] = tt; }
14+#define PUSHx(y) { if(m2) { PUSH2(y) } else PUSH1(y) }
15 #define PEEK(o, x, r) { if(m2) { r = (x); o = ram[r++] << 8 | ram[r]; } else o = ram[(x)]; }
16+#define POKE(x, y, r) { if(m2) { r = (x); ram[r++] = y >> 8; ram[r] = y; } else ram[(x)] = (y); }
17 #define DEVR(o, p)    { if(m2) { o = (emu_dei(u, p) << 8) | emu_dei(u, p + 1); } else o = emu_dei(u, p); }
18 #define DEVW(p, y)    { if(m2) { emu_deo(u, p, y >> 8); emu_deo(u, p + 1, y); } else emu_deo(u, p, y); }
19 
20@@ -31,8 +31,7 @@ uxn_eval(Uxn *u, Uint16 pc)
21 	Uint16 tt, a, b, c;
22 	if(!pc || u->dev[0x0f]) return 0;
23 	for(;;) {
24-		Uint8 ins = ram[pc++], opc = ins & 0x1f;
25-		Uint8 m2 = ins & 0x20;
26+		Uint8 ins = ram[pc++], opc = ins & 0x1f, m2 = ins & 0x20;
27 		Stack *s = ins & 0x40 ? &u->rst : &u->wst;
28 		if(ins & 0x80)
29 			kp = s->ptr, sp = &kp;
30@@ -48,7 +47,7 @@ uxn_eval(Uxn *u, Uint16 pc)
31 		case -0x4: /* LIT   */
32 		case -0x6: /* LITr  */ PUSH1(ram[pc++]) break;
33 		case -0x5: /* LIT2  */
34-		case -0x7: /* LIT2r */ PUSH2(PEEK2(ram + pc)) pc += 2; break;
35+		case -0x7: /* LIT2r */ PUSH1(ram[pc++]) PUSH1(ram[pc++]) break;
36 		/* ALU */
37 		case 0x01: /* INC */ POPx(a) PUSHx(a + 1) break;
38 		case 0x02: /* POP */ POPx(a) break;