commit 99d41a20275ca1a4929d31b095db6a97bc635553
parent c37d2cd75c855d0932a93cd8fdadd1db00b05e48
Author: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Sun, 18 Feb 2024 18:01:19 -0800
Updated core with memory wrapping
Diffstat:
4 files changed, 80 insertions(+), 77 deletions(-)
diff --git a/etc/cores/uxn-tnl.c b/etc/cores/uxn-tnl.c
@@ -30,8 +30,6 @@ WITH REGARD TO THIS SOFTWARE.
#define T2_(v) { r = (v); T = r; N = r >> 8; }
#define N2_(v) { r = (v); L = r; X = r >> 8; }
#define L2_(v) { r = (v); Y = r; Z = r >> 8; }
-#define DEI(p) (dei_masks[p] ? emu_dei(u, (p)) : u->dev[(p)])
-#define DEO(p, v) { u->dev[p] = v; if(deo_masks[p]) emu_deo(u, p); }
#define FLIP { s = ins & 0x40 ? &u->wst : &u->rst; }
#define SHIFT(y) { s->ptr += (y); }
#define SET(x, y) { SHIFT((ins & 0x80) ? x + y : y) }
@@ -39,83 +37,87 @@ WITH REGARD TO THIS SOFTWARE.
int
uxn_eval(Uxn *u, Uint16 pc)
{
- int t, n, l, r;
+ Uint16 t, n, l, r;
Uint8 *ram = u->ram, *rr;
if(!pc || u->dev[0x0f]) return 0;
for(;;) {
- int ins = ram[pc++];
+ Uint8 ins = ram[pc++];
Stack *s = ins & 0x40 ? &u->rst : &u->wst;
- switch(ins & 0x1f ? ins & 0x3f : ins << 4) {
- /* IMM */
- case 0x000: /* BRK */ return 1;
- case 0x200: /* JCI */ t=T; SHIFT(-1) if(!t) { pc += 2; break; } /* else fallthrough */
- case 0x400: /* JMI */ rr = ram + pc; pc += PEEK2(rr) + 2; break;
- case 0x600: /* JSI */ SHIFT( 2) T2_(pc + 2); rr = ram + pc; pc += PEEK2(rr) + 2; break;
- case 0x800: /* LIT */ case 0xc00: SHIFT( 1) T = ram[pc++]; break;
- case 0xa00: /* LIT2 */ case 0xe00: SHIFT( 2) rr = ram + pc; T2_(PEEK2(rr)) pc += 2; break;
- /* ALU */
- case 0x01: /* INC */ t=T; SET(1, 0) T = t + 1; break;
- case 0x21: /* INC2 */ t=T2; SET(2, 0) T2_(t + 1) break;
- case 0x02: /* POP */ SET(1,-1) break;
- case 0x22: /* POP2 */ SET(2,-2) break;
- case 0x03: /* NIP */ t=T; SET(2,-1) T = t; break;
- case 0x23: /* NIP2 */ t=T2; SET(4,-2) T2_(t) break;
- case 0x04: /* SWP */ t=T;n=N; SET(2, 0) T = n; N = t; break;
- case 0x24: /* SWP2 */ t=T2;n=N2; SET(4, 0) T2_(n) N2_(t) break;
- case 0x05: /* ROT */ t=T;n=N;l=L; SET(3, 0) T = l; N = t; L = n; break;
- case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) T2_(l) N2_(t) L2_(n) break;
- case 0x06: /* DUP */ t=T; SET(1, 1) T = t; N = t; break;
- case 0x26: /* DUP2 */ t=T2; SET(2, 2) T2_(t) N2_(t) break;
- case 0x07: /* OVR */ t=T;n=N; SET(2, 1) T = n; N = t; L = n; break;
- case 0x27: /* OVR2 */ t=T2;n=N2; SET(4, 2) T2_(n) N2_(t) L2_(n) break;
- case 0x08: /* EQU */ t=T;n=N; SET(2,-1) T = n == t; break;
- case 0x28: /* EQU2 */ t=T2;n=N2; SET(4,-3) T = n == t; break;
- case 0x09: /* NEQ */ t=T;n=N; SET(2,-1) T = n != t; break;
- case 0x29: /* NEQ2 */ t=T2;n=N2; SET(4,-3) T = n != t; break;
- case 0x0a: /* GTH */ t=T;n=N; SET(2,-1) T = n > t; break;
- case 0x2a: /* GTH2 */ t=T2;n=N2; SET(4,-3) T = n > t; break;
- case 0x0b: /* LTH */ t=T;n=N; SET(2,-1) T = n < t; break;
- case 0x2b: /* LTH2 */ t=T2;n=N2; SET(4,-3) T = n < t; break;
- case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break;
- case 0x2c: /* JMP2 */ t=T2; SET(2,-2) pc = t; break;
- case 0x0d: /* JCN */ t=T;n=N; SET(2,-2) if(n) pc += (Sint8)t; break;
- case 0x2d: /* JCN2 */ t=T2;n=L; SET(3,-3) if(n) pc = t; break;
- case 0x0e: /* JSR */ t=T; SET(1,-1) FLIP SHIFT(2) T2_(pc) pc += (Sint8)t; break;
- case 0x2e: /* JSR2 */ t=T2; SET(2,-2) FLIP SHIFT(2) T2_(pc) pc = t; break;
- case 0x0f: /* STH */ t=T; SET(1,-1) FLIP SHIFT(1) T = t; break;
- case 0x2f: /* STH2 */ t=T2; SET(2,-2) FLIP SHIFT(2) T2_(t) break;
- case 0x10: /* LDZ */ t=T; SET(1, 0) T = ram[t]; break;
- case 0x30: /* LDZ2 */ t=T; SET(1, 1) rr = ram + t; T2_(PEEK2(rr)) break;
- case 0x11: /* STZ */ t=T;n=N; SET(2,-2) ram[t] = n; break;
- case 0x31: /* STZ2 */ t=T;n=H2; SET(3,-3) rr = ram + t; POKE2(rr, n) break;
- case 0x12: /* LDR */ t=T; SET(1, 0) T = ram[pc + (Sint8)t]; break;
- case 0x32: /* LDR2 */ t=T; SET(1, 1) rr = ram + pc + (Sint8)t; T2_(PEEK2(rr)) break;
- case 0x13: /* STR */ t=T;n=N; SET(2,-2) ram[pc + (Sint8)t] = n; break;
- case 0x33: /* STR2 */ t=T;n=H2; SET(3,-3) rr = ram + pc + (Sint8)t; POKE2(rr, n) break;
- case 0x14: /* LDA */ t=T2; SET(2,-1) T = ram[t]; break;
- case 0x34: /* LDA2 */ t=T2; SET(2, 0) rr = ram + t; T2_(PEEK2(rr)) break;
- case 0x15: /* STA */ t=T2;n=L; SET(3,-3) ram[t] = n; break;
- case 0x35: /* STA2 */ t=T2;n=N2; SET(4,-4) rr = ram + t; POKE2(rr, n) break;
- case 0x16: /* DEI */ t=T; SET(1, 0) T = DEI(t); break;
- case 0x36: /* DEI2 */ t=T; SET(1, 1) T = DEI(t + 1); N = DEI(t); break;
- case 0x17: /* DEO */ t=T;n=N; SET(2,-2) DEO(t, n) break;
- case 0x37: /* DEO2 */ t=T;n=N;l=L; SET(3,-3) DEO(t, l) DEO((t + 1), n) break;
- case 0x18: /* ADD */ t=T;n=N; SET(2,-1) T = n + t; break;
- case 0x38: /* ADD2 */ t=T2;n=N2; SET(4,-2) T2_(n + t) break;
- case 0x19: /* SUB */ t=T;n=N; SET(2,-1) T = n - t; break;
- case 0x39: /* SUB2 */ t=T2;n=N2; SET(4,-2) T2_(n - t) break;
- case 0x1a: /* MUL */ t=T;n=N; SET(2,-1) T = n * t; break;
- case 0x3a: /* MUL2 */ t=T2;n=N2; SET(4,-2) T2_(n * t) break;
- case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) T = t ? n / t : 0; break;
- case 0x3b: /* DIV2 */ t=T2;n=N2; SET(4,-2) T2_(t ? n / t : 0) break;
- case 0x1c: /* AND */ t=T;n=N; SET(2,-1) T = n & t; break;
- case 0x3c: /* AND2 */ t=T2;n=N2; SET(4,-2) T2_(n & t) break;
- case 0x1d: /* ORA */ t=T;n=N; SET(2,-1) T = n | t; break;
- case 0x3d: /* ORA2 */ t=T2;n=N2; SET(4,-2) T2_(n | t) break;
- case 0x1e: /* EOR */ t=T;n=N; SET(2,-1) T = n ^ t; break;
- case 0x3e: /* EOR2 */ t=T2;n=N2; SET(4,-2) T2_(n ^ t) break;
- case 0x1f: /* SFT */ t=T;n=N; SET(2,-1) T = n >> (t & 0xf) << (t >> 4); break;
- case 0x3f: /* SFT2 */ t=T;n=H2; SET(3,-1) T2_(n >> (t & 0xf) << (t >> 4)) break;
+ switch(ins & 0x3f) {
+ /* IMM */
+ case 0x00: case 0x20:
+ switch(ins) {
+ case 0x00: /* BRK */ return 1;
+ case 0x20: /* JCI */ t=T; SHIFT(-1) if(!t) { pc += 2; break; } /* fall-through */
+ case 0x40: /* JMI */ rr = ram + pc; pc += 2 + PEEK2(rr); break;
+ case 0x60: /* JSI */ SHIFT( 2) rr = ram + pc; pc += 2; T2_(pc); pc += PEEK2(rr); break;
+ case 0x80: /* LIT */ case 0xc0: SHIFT( 1) T = ram[pc++]; break;
+ case 0xa0: /* LIT2 */ case 0xe0: SHIFT( 2) N = ram[pc++]; T = ram[pc++]; break;
+ } break;
+ /* ALU */
+ case 0x01: /* INC */ t=T; SET(1, 0) T = t + 1; break;
+ case 0x21: /* INC2 */ t=T2; SET(2, 0) T2_(t + 1) break;
+ case 0x02: /* POP */ SET(1,-1) break;
+ case 0x22: /* POP2 */ SET(2,-2) break;
+ case 0x03: /* NIP */ t=T; SET(2,-1) T = t; break;
+ case 0x23: /* NIP2 */ t=T2; SET(4,-2) T2_(t) break;
+ case 0x04: /* SWP */ t=T;n=N; SET(2, 0) T = n; N = t; break;
+ case 0x24: /* SWP2 */ t=T2;n=N2; SET(4, 0) T2_(n) N2_(t) break;
+ case 0x05: /* ROT */ t=T;n=N;l=L; SET(3, 0) T = l; N = t; L = n; break;
+ case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) T2_(l) N2_(t) L2_(n) break;
+ case 0x06: /* DUP */ t=T; SET(1, 1) T = t; N = t; break;
+ case 0x26: /* DUP2 */ t=T2; SET(2, 2) T2_(t) N2_(t) break;
+ case 0x07: /* OVR */ t=T;n=N; SET(2, 1) T = n; N = t; L = n; break;
+ case 0x27: /* OVR2 */ t=T2;n=N2; SET(4, 2) T2_(n) N2_(t) L2_(n) break;
+ case 0x08: /* EQU */ t=T;n=N; SET(2,-1) T = n == t; break;
+ case 0x28: /* EQU2 */ t=T2;n=N2; SET(4,-3) T = n == t; break;
+ case 0x09: /* NEQ */ t=T;n=N; SET(2,-1) T = n != t; break;
+ case 0x29: /* NEQ2 */ t=T2;n=N2; SET(4,-3) T = n != t; break;
+ case 0x0a: /* GTH */ t=T;n=N; SET(2,-1) T = n > t; break;
+ case 0x2a: /* GTH2 */ t=T2;n=N2; SET(4,-3) T = n > t; break;
+ case 0x0b: /* LTH */ t=T;n=N; SET(2,-1) T = n < t; break;
+ case 0x2b: /* LTH2 */ t=T2;n=N2; SET(4,-3) T = n < t; break;
+ case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break;
+ case 0x2c: /* JMP2 */ t=T2; SET(2,-2) pc = t; break;
+ case 0x0d: /* JCN */ t=T;n=N; SET(2,-2) if(n) pc += (Sint8)t; break;
+ case 0x2d: /* JCN2 */ t=T2;n=L; SET(3,-3) if(n) pc = t; break;
+ case 0x0e: /* JSR */ t=T; SET(1,-1) FLIP SHIFT(2) T2_(pc) pc += (Sint8)t; break;
+ case 0x2e: /* JSR2 */ t=T2; SET(2,-2) FLIP SHIFT(2) T2_(pc) pc = t; break;
+ case 0x0f: /* STH */ t=T; SET(1,-1) FLIP SHIFT(1) T = t; break;
+ case 0x2f: /* STH2 */ t=T2; SET(2,-2) FLIP SHIFT(2) T2_(t) break;
+ case 0x10: /* LDZ */ t=T; SET(1, 0) T = ram[t]; break;
+ case 0x30: /* LDZ2 */ t=T; SET(1, 1) N = ram[t++]; T = ram[(Uint8)t]; break;
+ case 0x11: /* STZ */ t=T;n=N; SET(2,-2) ram[t] = n; break;
+ case 0x31: /* STZ2 */ t=T;n=H2; SET(3,-3) ram[t++] = n >> 8; ram[(Uint8)t] = n; break;
+ case 0x12: /* LDR */ t=T; SET(1, 0) r = pc + (Sint8)t; T = ram[r]; break;
+ case 0x32: /* LDR2 */ t=T; SET(1, 1) r = pc + (Sint8)t; N = ram[r++]; T = ram[r]; break;
+ case 0x13: /* STR */ t=T;n=N; SET(2,-2) r = pc + (Sint8)t; ram[r] = n; break;
+ case 0x33: /* STR2 */ t=T;n=H2; SET(3,-3) r = pc + (Sint8)t; ram[r++] = n >> 8; ram[r] = n; break;
+ case 0x14: /* LDA */ t=T2; SET(2,-1) T = ram[t]; break;
+ case 0x34: /* LDA2 */ t=T2; SET(2, 0) N = ram[t++]; T = ram[t]; break;
+ case 0x15: /* STA */ t=T2;n=L; SET(3,-3) ram[t] = n; break;
+ case 0x35: /* STA2 */ t=T2;n=N2; SET(4,-4) ram[t++] = n >> 8; ram[t] = n; break;
+ case 0x16: /* DEI */ t=T; SET(1, 0) T = emu_dei(u, t); break;
+ case 0x36: /* DEI2 */ t=T; SET(1, 1) N = emu_dei(u, t++); T = emu_dei(u, t); break;
+ case 0x17: /* DEO */ t=T;n=N; SET(2,-2) emu_deo(u, t, n); break;
+ case 0x37: /* DEO2 */ t=T;n=N;l=L; SET(3,-3) emu_deo(u, t++, l); emu_deo(u, t, n); break;
+ case 0x18: /* ADD */ t=T;n=N; SET(2,-1) T = n + t; break;
+ case 0x38: /* ADD2 */ t=T2;n=N2; SET(4,-2) T2_(n + t) break;
+ case 0x19: /* SUB */ t=T;n=N; SET(2,-1) T = n - t; break;
+ case 0x39: /* SUB2 */ t=T2;n=N2; SET(4,-2) T2_(n - t) break;
+ case 0x1a: /* MUL */ t=T;n=N; SET(2,-1) T = n * t; break;
+ case 0x3a: /* MUL2 */ t=T2;n=N2; SET(4,-2) T2_(n * t) break;
+ case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) T = t ? n / t : 0; break;
+ case 0x3b: /* DIV2 */ t=T2;n=N2; SET(4,-2) T2_(t ? n / t : 0) break;
+ case 0x1c: /* AND */ t=T;n=N; SET(2,-1) T = n & t; break;
+ case 0x3c: /* AND2 */ t=T2;n=N2; SET(4,-2) T2_(n & t) break;
+ case 0x1d: /* ORA */ t=T;n=N; SET(2,-1) T = n | t; break;
+ case 0x3d: /* ORA2 */ t=T2;n=N2; SET(4,-2) T2_(n | t) break;
+ case 0x1e: /* EOR */ t=T;n=N; SET(2,-1) T = n ^ t; break;
+ case 0x3e: /* EOR2 */ t=T2;n=N2; SET(4,-2) T2_(n ^ t) break;
+ case 0x1f: /* SFT */ t=T;n=N; SET(2,-1) T = n >> (t & 0xf) << (t >> 4); break;
+ case 0x3f: /* SFT2 */ t=T;n=H2; SET(3,-1) T2_(n >> (t & 0xf) << (t >> 4)) break;
}
}
}
+
diff --git a/src/uxn.c b/src/uxn.c
@@ -120,3 +120,4 @@ uxn_eval(Uxn *u, Uint16 pc)
}
}
}
+
diff --git a/src/uxncli.c b/src/uxncli.c
@@ -51,7 +51,7 @@ main(int argc, char **argv)
if(i == argc)
return system_error("usage:", "uxncli [-v] file.rom [args..]");
if(argv[i][0] == '-' && argv[i][1] == 'v')
- return system_error("Uxncli - Varvara Emulator(CLI)", "15 Feb 2024.");
+ return system_error("Uxncli - Varvara Emulator(CLI)", "18 Feb 2024.");
if(!system_init(&u, (Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)), argv[i++]))
return system_error("Init", "Failed to initialize uxn.");
/* eval */
diff --git a/src/uxnemu.c b/src/uxnemu.c
@@ -499,7 +499,7 @@ main(int argc, char **argv)
/* flags */
if(argc > 1 && argv[i][0] == '-') {
if(!strcmp(argv[i], "-v"))
- return system_error("Uxnemu - Varvara Emulator(GUI)", "14 Feb 2024.");
+ return system_error("Uxnemu - Varvara Emulator(GUI)", "18 Feb 2024.");
else if(!strcmp(argv[i], "-2x"))
set_zoom(2, 0);
else if(!strcmp(argv[i], "-3x"))
