commit 5abea12b4676dac9c855b03516c93488729f7f1e
parent d167b889962dfeb451e42c9172410f62e1ad75c9
Author: neauoire <aliceffekt@gmail.com>
Date: Mon, 30 Oct 2023 11:35:46 -0700
Made a backup of tnl core
Diffstat:
| M | etc/cores/uxn-tnl.c | | | 184 | +++++++++++++++++++++++++++++++++++++------------------------------------------ |
| D | etc/cores/uxn.h | | | 50 | -------------------------------------------------- |
2 files changed, 86 insertions(+), 148 deletions(-)
diff --git a/etc/cores/uxn-tnl.c b/etc/cores/uxn-tnl.c
@@ -12,122 +12,110 @@ WITH REGARD TO THIS SOFTWARE.
*/
/* Registers
-[ . ][ . ][ . ][ L ][ N ][ T ] <
-[ . ][ . ][ . ][ H2 ][ T ] <
+[ Z ][ Y ][ X ][ L ][ N ][ T ] <
+[ . ][ . ][ . ][ H2 ][ . ] <
[ L2 ][ N2 ][ T2 ] <
*/
-#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 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); }
+#define T *(s->dat + s->ptr)
+#define N *(s->dat + (Uint8)(s->ptr - 1))
+#define L *(s->dat + (Uint8)(s->ptr - 2))
+#define X *(s->dat + (Uint8)(s->ptr - 3))
+#define Y *(s->dat + (Uint8)(s->ptr - 4))
+#define Z *(s->dat + (Uint8)(s->ptr - 5))
+#define T2 (N << 8 | T)
+#define H2 (L << 8 | N)
+#define N2 (X << 8 | L)
+#define L2 (Z << 8 | Y)
+#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) }
int
uxn_eval(Uxn *u, Uint16 pc)
{
- int t, n, l, k, tmp, ins, opc;
- Uint8 *ram = u->ram, *sp;
- Stack *s;
+ int t, n, l, r;
+ Uint8 *ram = u->ram, *rr;
if(!pc || u->dev[0x0f]) return 0;
for(;;) {
- ins = ram[pc++];
- k = ins & 0x80 ? 0xff : 0;
- s = ins & 0x40 ? &u->rst : &u->wst;
- sp = s->dat + s->ptr - 1;
- opc = !(ins & 0x1f) ? (0 - (ins >> 5)) & 0xff : ins & 0x3f;
- switch(opc) {
+ int ins = ram[pc++];
+ Stack *s = ins & 0x40 ? &u->rst : &u->wst;
+ switch(ins & 0x1f ? ins & 0x3f : ins << 4) {
/* 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;
+ 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) PUT(0, t + 1) break;
- case 0x21: t=T2; SET(2, 0) PUT2(0, t + 1) break;
+ 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: 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 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: t=T2; SET(2,-2) pc = 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: 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 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: 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 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: 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 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: 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 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: 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;
+ 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;
}
}
}
-
-int
-uxn_boot(Uxn *u, Uint8 *ram)
-{
- Uint32 i;
- char *cptr = (char *)u;
- for(i = 0; i < sizeof(*u); i++)
- cptr[i] = 0;
- u->ram = ram;
- return 1;
-}
diff --git a/etc/cores/uxn.h b/etc/cores/uxn.h
@@ -1,50 +0,0 @@
-/*
-Copyright (c) 2021 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
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE.
-*/
-
-/* clang-format off */
-
-#define POKE2(d, v) { (d)[0] = (v) >> 8; (d)[1] = (v); }
-#define PEEK2(d) ((d)[0] << 8 | (d)[1])
-#define DEO(p, v) { u->dev[p] = v; if((deo_mask[p >> 4] >> (p & 0xf)) & 0x1) emu_deo(u, p); }
-#define DEI(p) ((dei_mask[(p) >> 4] >> ((p) & 0xf)) & 0x1 ? emu_dei(u, (p)) : u->dev[(p)])
-
-/* clang-format on */
-
-#define PAGE_PROGRAM 0x0100
-
-typedef unsigned char Uint8;
-typedef signed char Sint8;
-typedef unsigned short Uint16;
-typedef signed short Sint16;
-typedef unsigned int Uint32;
-
-typedef struct {
- Uint8 dat[255], ptr;
-} Stack;
-
-typedef struct Uxn {
- Uint8 *ram, dev[256];
- Stack wst, rst;
- Uint8 (*dei)(struct Uxn *u, Uint8 addr);
- void (*deo)(struct Uxn *u, Uint8 addr);
-} Uxn;
-
-/* required functions */
-
-extern Uint8 emu_dei(Uxn *u, Uint8 addr);
-extern void emu_deo(Uxn *u, Uint8 addr);
-extern int emu_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr);
-extern Uint16 dev_vers[0x10], dei_mask[0x10], deo_mask[0x10];
-
-/* built-ins */
-
-int uxn_boot(Uxn *u, Uint8 *ram);
-int uxn_eval(Uxn *u, Uint16 pc);
