commit bd05808

Devine Lu Linvega  ·  2024-11-12 04:34:33 +0000 UTC
parent a7672e6 
(uxn.c) Cleanup
2 files changed,  +6, -6
M src/uxn.c
M src/uxncli.c
M src/uxn.c
+5, -5 
 1@@ -29,14 +29,14 @@ WITH REGARD TO THIS SOFTWARE.
 2 #define REM if(_r) uxn.rst.ptr -= 1 + _2; else uxn.wst.ptr -= 1 + _2;
 3 #define INC(s) uxn.s.dat[uxn.s.ptr++]
 4 #define DEC(s) uxn.s.dat[--uxn.s.ptr]
 5-#define POx(o) if(_2) { PO2(o) } else PO1(o)
 6 #define PO1(o) o = _r ? DEC(rst) : DEC(wst);
 7 #define PO2(o) PO1(o) o |= (_r ? DEC(rst) : DEC(wst)) << 8;
 8-#define PUx(i) if(_2) { c = (i); PU1(c >> 8) PU1(c) } else PU1(i)
 9+#define POx(o) if(_2) { PO2(o) } else PO1(o)
10 #define PU1(i) if(_r) INC(rst) = i; else INC(wst) = i;
11 #define RP1(i) if(_r) INC(wst) = i; else INC(rst) = i;
12+#define PUx(i) if(_2) { c = (i); PU1(c >> 8) PU1(c) } else PU1(i)
13 #define GET(o) if(_2) PO1(o[1]) PO1(o[0])
14-#define PUT(i) PU1(i[0]) if(_2) { PU1(i[1]) }
15+#define PUT(i) PU1(i[0]) if(_2) PU1(i[1])
16 #define DEI(i,o) o[0] = emu_dei(i); if(_2) o[1] = emu_dei(i + 1); PUT(o)
17 #define DEO(i,j) emu_deo(i, j[0]); if(_2) emu_deo(i + 1, j[1]);
18 #define PEK(i,o,m) o[0] = uxn.ram[i]; if(_2) o[1] = uxn.ram[(i + 1) & m]; PUT(o)
19@@ -69,9 +69,9 @@ uxn_eval(Uint16 pc)
20 		/* GTH */ OPC(0x0a, POx(a) POx(b),PU1(b > a))
21 		/* LTH */ OPC(0x0b, POx(a) POx(b),PU1(b < a))
22 		/* JMP */ OPC(0x0c, POx(a),JMP(a))
23-		/* JCN */ OPC(0x0d, POx(a) PO1(b), if(b) { JMP(a) })
24+		/* JCN */ OPC(0x0d, POx(a) PO1(b), if(b) JMP(a))
25 		/* JSR */ OPC(0x0e, POx(a),RP1(pc >> 8) RP1(pc) JMP(a))
26-		/* STH */ OPC(0x0f, GET(x),RP1(x[0]) if(_2) { RP1(x[1]) })
27+		/* STH */ OPC(0x0f, GET(x),RP1(x[0]) if(_2) RP1(x[1]))
28 		/* LDZ */ OPC(0x10, PO1(a),PEK(a, x, 0xff))
29 		/* STZ */ OPC(0x11, PO1(a) GET(y),POK(a, y, 0xff))
30 		/* LDR */ OPC(0x12, PO1(a),PEK(pc + (Sint8)a, x, 0xffff))
M src/uxncli.c
+1, -1 
1@@ -66,7 +66,7 @@ main(int argc, char **argv)
2 		return !fprintf(stdout, "usage: %s [-v] file.rom [args..]\n", argv[0]);
3 	else {
4 		uxn.dev[0x17] = argc - 2;
5-		if(uxn_eval(PAGE_PROGRAM) && PEEK2(uxn.dev + 0x10))
6+		if(uxn_eval(PAGE_PROGRAM) && uxn.dev[0x10])
7 			console_listen(2, argc, argv), emu_run();
8 	}
9 	return uxn.dev[0x0f] & 0x7f;