commit 837b839b4c41ce826984d6ed670ca0ae9af0e36f
parent 1d8babb397a532f2c43f4d971f9a048f6e2c742e
Author: neauoire <aliceffekt@gmail.com>
Date: Wed, 9 Aug 2023 13:20:03 -0700
(uxn.c) Using tnl core
Diffstat:
2 files changed, 99 insertions(+), 73 deletions(-)
diff --git a/etc/cores/uxn-tnl.c b/etc/cores/uxn-tnl.c
@@ -25,11 +25,11 @@ WITH REGARD TO THIS SOFTWARE.
#define N2 PEEK2((sp-3))
#define L2 PEEK2((sp-5))
-#define HALT(c) { return emu_halt(u, ins, (c), pc - 1); }
+#define HALT(c) { return emu_halt(u, ins, c, pc - 1); }
#define FLIP { s = ins & 0x40 ? &u->wst : &u->rst; }
-#define SET(x, y) { if(x > s->ptr) HALT(1) tmp = (x & k) + y + s->ptr; if(tmp > 254) HALT(2) s->ptr = tmp; }
-#define PUT(o, v) { s->dat[(s->ptr - 1 - (o))] = (v); }
-#define PUT2(o, v) { tmp = (v); POKE2(s->dat + (s->ptr - 2 - (o)), tmp); }
+#define SET(x, y) { if(x > s->ptr) HALT(1) tmp = (x & k) + y + s->ptr; if(tmp > 254) HALT(2) s->ptr = tmp; sp = s->dat + tmp - 1; }
+#define PUT(o, v) { *(sp - o) = v; }
+#define PUT2(o, v) { tmp = (v); POKE2(sp - 1 - o, tmp); }
int
uxn_eval(Uxn *u, Uint16 pc)
diff --git a/src/uxn.c b/src/uxn.c
@@ -11,85 +11,112 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE.
*/
-#define HALT(c) { return emu_halt(u, ins, (c), pc - 1); }
-#define FLIP { s = ins & 0x40 ? &u->wst : &u->rst; }
-#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
-#define POKE(x, y) { if(m2) { POKE2(ram + x, y) } else { ram[(x)] = (y); } }
-#define PEEK(o, x) { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; }
-#define DEVW(p, y) { if(m2) { DEO(p, y >> 8) DEO((p + 1), y) } else { DEO(p, y) } }
-#define DEVR(o, p) { if(m2) { o = DEI(p) << 8 | DEI(p + 1); } else { o = DEI(p); } }
+/* Registers
+[ . ][ . ][ . ][ L ][ N ][ T ] <
+[ . ][ . ][ . ][ H2 ][ T ] <
+[ L2 ][ N2 ][ T2 ] <
+*/
-#define PUSH1(y) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (y); }
-#define PUSH2(y) { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (y); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; }
-#define PUSHx(y) { if(m2) { PUSH2(y) } else { PUSH1(y) } }
-#define PUSH11(y, z) { if(s->ptr >= 0xfe) HALT(2) s->dat[s->ptr++] = (y); s->dat[s->ptr++] = (z); }
-#define PUSH22(y, z) { if((tsp = s->ptr) >= 0xfc) HALT(2) POKE2(&s->dat[tsp], (y)); POKE2(&s->dat[tsp+2], (z)); s->ptr = tsp + 4; }
-#define PUSHxx(y, z) { if(m2) { PUSH22(y, z) } else { PUSH11(y, z) } }
+#define T *sp
+#define N *(sp-1)
+#define L *(sp-2)
+#define T2 PEEK2((sp-1))
+#define H2 PEEK2((sp-2))
+#define N2 PEEK2((sp-3))
+#define L2 PEEK2((sp-5))
-#define POP1(o) { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
-#define POP2(o) { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
-#define POPx(o) { if(m2) { POP2(o) } else { POP1(o) } }
-#define POP11(o, p) { if(*sp <= 0x01) HALT(1) o = s->dat[--*sp]; p = s->dat[--*sp]; }
-#define POP22(o, p) { if((tsp = *sp) <= 0x03) HALT(1) o = PEEK2(&s->dat[tsp - 2]); p = PEEK2(&s->dat[tsp - 4]); *sp = tsp - 4; }
-#define POPxx(o, p) { if(m2) { POP22(o, p) } else { POP11(o, p) } }
+#define HALT(c) { return emu_halt(u, ins, c, pc - 1); }
+#define FLIP { s = ins & 0x40 ? &u->wst : &u->rst; }
+#define SET(x, y) { if(x > s->ptr) HALT(1) tmp = (x & k) + y + s->ptr; if(tmp > 254) HALT(2) s->ptr = tmp; sp = s->dat + tmp - 1; }
+#define PUT(o, v) { *(sp - o) = v; }
+#define PUT2(o, v) { tmp = (v); POKE2(sp - 1 - o, tmp); }
int
uxn_eval(Uxn *u, Uint16 pc)
{
- Uint8 ins, opc, m2, ksp, tsp, *sp, *ram = u->ram;
- Uint16 a, b, c, t;
+ int t, n, l, k, tmp, ins, opc;
+ Uint8 *ram = u->ram, *sp;
Stack *s;
if(!pc || u->dev[0x0f]) return 0;
for(;;) {
ins = ram[pc++];
- /* modes */
- opc = ins & 0x1f;
- m2 = ins & 0x20;
+ k = ins & 0x80 ? 0xff : 0;
s = ins & 0x40 ? &u->rst : &u->wst;
- if(ins & 0x80) { ksp = s->ptr; sp = &ksp; } else sp = &s->ptr;
- /* Opcodes */
- switch(opc - (!opc * (ins >> 5))) {
- /* Immediate */
- case -0x0: /* BRK */ return 1;
- case -0x1: /* JCI */ POP1(b) if(!b) { pc += 2; break; } /* else fallthrough */
- case -0x2: /* JMI */ pc += PEEK2(ram + pc) + 2; break;
- case -0x3: /* JSI */ PUSH2(pc + 2) pc += PEEK2(ram + pc) + 2; break;
- case -0x4: /* LIT */
- case -0x6: /* LITr */ PUSH1(ram[pc++]) break;
- case -0x5: /* LIT2 */
- case -0x7: /* LIT2r */ PUSH2(PEEK2(ram + pc)) pc += 2; break;
- /* ALU */
- case 0x01: /* INC */ POPx(a) PUSHx(a + 1) break;
- case 0x02: /* POP */ POPx(a) break;
- case 0x03: /* NIP */ POPxx(a, b) PUSHx(a) break;
- case 0x04: /* SWP */ POPxx(a, b) PUSHxx(a, b) break;
- case 0x05: /* ROT */ POPxx(a, b) POPx(c) PUSHxx(b, a) PUSHx(c) break;
- case 0x06: /* DUP */ POPx(a) PUSHxx(a, a) break;
- case 0x07: /* OVR */ POPxx(a, b) PUSHxx(b, a) PUSHx(b) break;
- case 0x08: /* EQU */ POPxx(a, b) PUSH1(b == a) break;
- case 0x09: /* NEQ */ POPxx(a, b) PUSH1(b != a) break;
- case 0x0a: /* GTH */ POPxx(a, b) PUSH1(b > a) break;
- case 0x0b: /* LTH */ POPxx(a, b) PUSH1(b < a) break;
- case 0x0c: /* JMP */ POPx(a) JUMP(a) break;
- case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break;
- case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break;
- case 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break;
- case 0x10: /* LDZ */ POP1(a) PEEK(b, a) PUSHx(b) break;
- case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b) break;
- case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a) PUSHx(b) break;
- case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b) break;
- case 0x14: /* LDA */ POP2(a) PEEK(b, a) PUSHx(b) break;
- case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b) break;
- case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break;
- case 0x17: /* DEO */ POP1(a) POPx(b) DEVW(a, b) break;
- case 0x18: /* ADD */ POPxx(a, b) PUSHx(b + a) break;
- case 0x19: /* SUB */ POPxx(a, b) PUSHx(b - a) break;
- case 0x1a: /* MUL */ POPxx(a, b) PUSHx((Uint32)b * a) break;
- case 0x1b: /* DIV */ POPxx(a, b) if(!a) HALT(3) PUSHx(b / a) break;
- case 0x1c: /* AND */ POPxx(a, b) PUSHx(b & a) break;
- case 0x1d: /* ORA */ POPxx(a, b) PUSHx(b | a) break;
- case 0x1e: /* EOR */ POPxx(a, b) PUSHx(b ^ a) break;
- case 0x1f: /* SFT */ POP1(a) POPx(b) PUSHx(b >> (a & 0xf) << (a >> 4)) break;
+ sp = s->dat + s->ptr - 1;
+ opc = !(ins & 0x1f) ? (0 - (ins >> 5)) & 0xff : ins & 0x3f;
+ switch(opc) {
+ /* IMM */
+ case 0x00: /* BRK */ return 1;
+ case 0xff: /* JCI */ if(!s->dat[--s->ptr]) { pc += 2; break; }
+ case 0xfe: /* JMI */ pc += PEEK2(ram + pc) + 2; break;
+ case 0xfd: /* JSI */ SET(0, 2) PUT2(0, pc + 2) pc += PEEK2(ram + pc) + 2; break;
+ case 0xfc: /* LIT */ SET(0, 1) PUT(0, ram[pc++]) break;
+ case 0xfb: /* LIT2 */ SET(0, 2) PUT2(0, PEEK2(ram + pc)) pc += 2; break;
+ case 0xfa: /* LITr */ SET(0, 1) PUT(0, ram[pc++]) break;
+ case 0xf9: /* LIT2r */ SET(0, 2) PUT2(0, PEEK2(ram + pc)) pc += 2; break;
+ /* ALU */
+ case 0x01: /* INC */ t=T; SET(1, 0) PUT(0, t + 1) break;
+ case 0x21: t=T2; SET(2, 0) PUT2(0, t + 1) break;
+ case 0x02: /* POP */ SET(1,-1) break;
+ case 0x22: SET(2,-2) break;
+ case 0x03: /* NIP */ t=T; SET(2,-1) PUT(0, t) break;
+ case 0x23: t=T2; SET(4,-2) PUT2(0, t) break;
+ case 0x04: /* SWP */ t=T;n=N; SET(2, 0) PUT(0, n) PUT(1, t) break;
+ case 0x24: t=T2;n=N2; SET(4, 0) PUT2(0, n) PUT2(2, t) break;
+ case 0x05: /* ROT */ t=T;n=N;l=L; SET(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break;
+ case 0x25: t=T2;n=N2;l=L2; SET(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
+ case 0x06: /* DUP */ t=T; SET(1, 1) PUT(0, t) PUT(1, t) break;
+ case 0x26: t=T2; SET(2, 2) PUT2(0, t) PUT2(2, t) break;
+ case 0x07: /* OVR */ t=T;n=N; SET(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break;
+ case 0x27: t=T2;n=N2; SET(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
+ case 0x08: /* EQU */ t=T;n=N; SET(2,-1) PUT(0, n == t) break;
+ case 0x28: t=T2;n=N2; SET(4,-3) PUT(0, n == t) break;
+ case 0x09: /* NEQ */ t=T;n=N; SET(2,-1) PUT(0, n != t) break;
+ case 0x29: t=T2;n=N2; SET(4,-3) PUT(0, n != t) break;
+ case 0x0a: /* GTH */ t=T;n=N; SET(2,-1) PUT(0, n > t) break;
+ case 0x2a: t=T2;n=N2; SET(4,-3) PUT(0, n > t) break;
+ case 0x0b: /* LTH */ t=T;n=N; SET(2,-1) PUT(0, n < t) break;
+ case 0x2b: t=T2;n=N2; SET(4,-3) PUT(0, n < t) break;
+ case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break;
+ case 0x2c: 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: t=T2;n=L; SET(3,-3) if(n) pc = t; break;
+ case 0x0e: /* JSR */ t=T; SET(1,-1) FLIP SET(0,2) PUT2(0, pc) pc += (Sint8)t; break;
+ case 0x2e: t=T2; SET(2,-2) FLIP SET(0,2) PUT2(0, pc) pc = t; break;
+ case 0x0f: /* STH */ t=T; SET(1,-1) FLIP SET(0,1) PUT(0, t) break;
+ case 0x2f: t=T2; SET(2,-2) FLIP SET(0,2) PUT2(0, t) break;
+ case 0x10: /* LDZ */ t=T; SET(1, 0) PUT(0, ram[t]) break;
+ case 0x30: t=T; SET(1, 1) PUT2(0, PEEK2(ram + t)) break;
+ case 0x11: /* STZ */ t=T;n=N; SET(2,-2) ram[t] = n; break;
+ case 0x31: t=T;n=H2; SET(3,-3) POKE2(ram + t, n) break;
+ case 0x12: /* LDR */ t=T; SET(1, 0) PUT(0, ram[pc + (Sint8)t]) break;
+ case 0x32: t=T; SET(1, 1) PUT2(0, PEEK2(ram + pc + (Sint8)t)) break;
+ case 0x13: /* STR */ t=T;n=N; SET(2,-2) ram[pc + (Sint8)t] = n; break;
+ case 0x33: t=T;n=H2; SET(3,-3) POKE2(ram + pc + (Sint8)t, n) break;
+ case 0x14: /* LDA */ t=T2; SET(2,-1) PUT(0, ram[t]) break;
+ case 0x34: t=T2; SET(2, 0) PUT2(0, PEEK2(ram + t)) break;
+ case 0x15: /* STA */ t=T2;n=L; SET(3,-3) ram[t] = n; break;
+ case 0x35: t=T2;n=N2; SET(4,-4) POKE2(ram + t, n) break;
+ case 0x16: /* DEI */ t=T; SET(1, 0) PUT(0, DEI(t)) break;
+ case 0x36: t=T; SET(1, 1) PUT(1, DEI(t)) PUT(0, DEI(t + 1)) break;
+ case 0x17: /* DEO */ t=T;n=N; SET(2,-2) DEO(t, n) break;
+ case 0x37: 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) PUT(0, n + t) break;
+ case 0x38: t=T2;n=N2; SET(4,-2) PUT2(0, n + t) break;
+ case 0x19: /* SUB */ t=T;n=N; SET(2,-1) PUT(0, n - t) break;
+ case 0x39: t=T2;n=N2; SET(4,-2) PUT2(0, n - t) break;
+ case 0x1a: /* MUL */ t=T;n=N; SET(2,-1) PUT(0, n * t) break;
+ case 0x3a: t=T2;n=N2; SET(4,-2) PUT2(0, n * t) break;
+ case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) if(!t) HALT(3) PUT(0, n / t) break;
+ case 0x3b: t=T2;n=N2; SET(4,-2) if(!t) HALT(3) PUT2(0, n / t) break;
+ case 0x1c: /* AND */ t=T;n=N; SET(2,-1) PUT(0, n & t) break;
+ case 0x3c: t=T2;n=N2; SET(4,-2) PUT2(0, n & t) break;
+ case 0x1d: /* ORA */ t=T;n=N; SET(2,-1) PUT(0, n | t) break;
+ case 0x3d: t=T2;n=N2; SET(4,-2) PUT2(0, n | t) break;
+ case 0x1e: /* EOR */ t=T;n=N; SET(2,-1) PUT(0, n ^ t) break;
+ case 0x3e: t=T2;n=N2; SET(4,-2) PUT2(0, n ^ t) break;
+ case 0x1f: /* SFT */ t=T;n=N; SET(2,-1) PUT(0, n >> (t & 0xf) << (t >> 4)) break;
+ case 0x3f: t=T;n=H2; SET(3,-1) PUT2(0, n >> (t & 0xf) << (t >> 4)) break;
}
}
}
@@ -103,5 +130,4 @@ uxn_boot(Uxn *u, Uint8 *ram)
cptr[i] = 0;
u->ram = ram;
return 1;
-
}
