Dariaceli's Git
Browse code

Made a backup of tnl core

neauoire authored on 30/10/2023 18:35:46
Showing 2 changed files
etc/cores/uxn-tnl.c
History View file @ 5abea12
... ... 
@@ -12,122 +12,110 @@ WITH REGARD TO THIS SOFTWARE.
12 12 
 */
13 13
14 14 
 /* Registers
15 
-[ . ][ . ][ . ][ L ][ N ][ T ] <
16 
-[ . ][ . ][ . ][   H2   ][ T ] <
15 
+[ Z ][ Y ][ X ][ L ][ N ][ T ] <
16 
+[ . ][ . ][ . ][   H2   ][ . ] <
17 17 
 [   L2   ][   N2   ][   T2   ] <
18 18 
 */
19 19
20 
-#define T *sp
21 
-#define N *(sp-1)
22 
-#define L *(sp-2)
23 
-#define T2 PEEK2((sp-1))
24 
-#define H2 PEEK2((sp-2))
25 
-#define N2 PEEK2((sp-3))
26 
-#define L2 PEEK2((sp-5))
27 
-
28 
-#define HALT(c)    { return emu_halt(u, ins, c, pc - 1); }
29 
-#define FLIP       { s = ins & 0x40 ? &u->wst : &u->rst; }
30 
-#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; }
31 
-#define PUT(o, v)  { *(sp - o) = v; }
32 
-#define PUT2(o, v) { tmp = (v); POKE2(sp - 1 - o, tmp); }
20 
+#define T *(s->dat + s->ptr)
21 
+#define N *(s->dat + (Uint8)(s->ptr - 1))
22 
+#define L *(s->dat + (Uint8)(s->ptr - 2))
23 
+#define X *(s->dat + (Uint8)(s->ptr - 3))
24 
+#define Y *(s->dat + (Uint8)(s->ptr - 4))
25 
+#define Z *(s->dat + (Uint8)(s->ptr - 5))
26 
+#define T2 (N << 8 | T)
27 
+#define H2 (L << 8 | N)
28 
+#define N2 (X << 8 | L)
29 
+#define L2 (Z << 8 | Y)
30 
+#define T2_(v) { r = (v); T = r; N = r >> 8; }
31 
+#define N2_(v) { r = (v); L = r; X = r >> 8; }
32 
+#define L2_(v) { r = (v); Y = r; Z = r >> 8; }
33 
+#define DEI(p) (dei_masks[p] ? emu_dei(u, (p)) : u->dev[(p)])
34 
+#define DEO(p, v) { u->dev[p] = v; if(deo_masks[p]) emu_deo(u, p); }
35 
+#define FLIP      { s = ins & 0x40 ? &u->wst : &u->rst; }
36 
+#define SHIFT(y)  { s->ptr += (y); }
37 
+#define SET(x, y) { SHIFT((ins & 0x80) ? x + y : y) }
33 38
34 39 
 int
35 40 
 uxn_eval(Uxn *u, Uint16 pc)
36 41 
 {
37 
-	int t, n, l, k, tmp, ins, opc;
38 
-	Uint8 *ram = u->ram, *sp;
39 
-	Stack *s;
42 
+	int t, n, l, r;
43 
+	Uint8 *ram = u->ram, *rr;
40 44 
 	if(!pc || u->dev[0x0f]) return 0;
41 45 
 	for(;;) {
42 
-		ins = ram[pc++];
43 
-		k = ins & 0x80 ? 0xff : 0;
44 
-		s = ins & 0x40 ? &u->rst : &u->wst;
45 
-		sp = s->dat + s->ptr - 1;
46 
-		opc = !(ins & 0x1f) ? (0 - (ins >> 5)) & 0xff : ins & 0x3f;
47 
-		switch(opc) {
46 
+		int ins = ram[pc++];
47 
+		Stack *s = ins & 0x40 ? &u->rst : &u->wst;
48 
+		switch(ins & 0x1f ? ins & 0x3f : ins << 4) {
48 49 
 			/* IMM */
49 
-			case 0x00: /* BRK   */                          return 1;
50 
-			case 0xff: /* JCI   */                          if(!s->dat[--s->ptr]) { pc += 2; break; }
51 
-			case 0xfe: /* JMI   */                          pc += PEEK2(ram + pc) + 2; break;
52 
-			case 0xfd: /* JSI   */                SET(0, 2) PUT2(0, pc + 2) pc += PEEK2(ram + pc) + 2; break;
53 
-			case 0xfc: /* LIT   */                SET(0, 1) PUT(0, ram[pc++]) break;
54 
-			case 0xfb: /* LIT2  */                SET(0, 2) PUT2(0, PEEK2(ram + pc)) pc += 2; break;
55 
-			case 0xfa: /* LITr  */                SET(0, 1) PUT(0, ram[pc++]) break;
56 
-			case 0xf9: /* LIT2r */                SET(0, 2) PUT2(0, PEEK2(ram + pc)) pc += 2; break;
50 
+			case 0x000: /* BRK  */                          return 1;
51 
+			case 0x200: /* JCI  */ t=T;           SHIFT(-1) if(!t) { pc += 2; break; } /* else fallthrough */
52 
+			case 0x400: /* JMI  */                          rr = ram + pc; pc += PEEK2(rr) + 2; break;
53 
+			case 0x600: /* JSI  */                SHIFT( 2) T2_(pc + 2); rr = ram + pc; pc += PEEK2(rr) + 2; break;
54 
+			case 0x800: /* LIT  */ case 0xc00:    SHIFT( 1) T = ram[pc++]; break;
55 
+			case 0xa00: /* LIT2 */ case 0xe00:    SHIFT( 2) rr = ram + pc; T2_(PEEK2(rr)) pc += 2; break;
57 56 
 			/* ALU */
58 
-			case 0x01: /* INC  */ t=T;            SET(1, 0) PUT(0, t + 1) break;
59 
-			case 0x21:            t=T2;           SET(2, 0) PUT2(0, t + 1) break;
57 
+			case 0x01: /* INC  */ t=T;            SET(1, 0) T = t + 1; break;
58 
+			case 0x21: /* INC2 */ t=T2;           SET(2, 0) T2_(t + 1) break;
60 59 
 			case 0x02: /* POP  */                 SET(1,-1) break;
61 
-			case 0x22:                            SET(2,-2) break;
62 
-			case 0x03: /* NIP  */ t=T;            SET(2,-1) PUT(0, t) break;
63 
-			case 0x23:            t=T2;           SET(4,-2) PUT2(0, t) break;
64 
-			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) PUT(0, n) PUT(1, t) break;
65 
-			case 0x24:            t=T2;n=N2;      SET(4, 0) PUT2(0, n) PUT2(2, t) break;
66 
-			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break;
67 
-			case 0x25:            t=T2;n=N2;l=L2; SET(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
68 
-			case 0x06: /* DUP  */ t=T;            SET(1, 1) PUT(0, t) PUT(1, t) break;
69 
-			case 0x26:            t=T2;           SET(2, 2) PUT2(0, t) PUT2(2, t) break;
70 
-			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break;
71 
-			case 0x27:            t=T2;n=N2;      SET(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
72 
-			case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) PUT(0, n == t) break;
73 
-			case 0x28:            t=T2;n=N2;      SET(4,-3) PUT(0, n == t) break;
74 
-			case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) PUT(0, n != t) break;
75 
-			case 0x29:            t=T2;n=N2;      SET(4,-3) PUT(0, n != t) break;
76 
-			case 0x0a: /* GTH  */ t=T;n=N;        SET(2,-1) PUT(0, n > t) break;
77 
-			case 0x2a:            t=T2;n=N2;      SET(4,-3) PUT(0, n > t) break;
78 
-			case 0x0b: /* LTH  */ t=T;n=N;        SET(2,-1) PUT(0, n < t) break;
79 
-			case 0x2b:            t=T2;n=N2;      SET(4,-3) PUT(0, n < t) break;
60 
+			case 0x22: /* POP2 */                 SET(2,-2) break;
61 
+			case 0x03: /* NIP  */ t=T;            SET(2,-1) T = t; break;
62 
+			case 0x23: /* NIP2 */ t=T2;           SET(4,-2) T2_(t) break;
63 
+			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) T = n; N = t; break;
64 
+			case 0x24: /* SWP2 */ t=T2;n=N2;      SET(4, 0) T2_(n) N2_(t) break;
65 
+			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) T = l; N = t; L = n; break;
66 
+			case 0x25: /* ROT2 */ t=T2;n=N2;l=L2; SET(6, 0) T2_(l) N2_(t) L2_(n) break;
67 
+			case 0x06: /* DUP  */ t=T;            SET(1, 1) T = t; N = t; break;
68 
+			case 0x26: /* DUP2 */ t=T2;           SET(2, 2) T2_(t) N2_(t) break;
69 
+			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) T = n; N = t; L = n; break;
70 
+			case 0x27: /* OVR2 */ t=T2;n=N2;      SET(4, 2) T2_(n) N2_(t) L2_(n) break;
71 
+			case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) T = n == t; break;
72 
+			case 0x28: /* EQU2 */ t=T2;n=N2;      SET(4,-3) T = n == t; break;
73 
+			case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) T = n != t; break;
74 
+			case 0x29: /* NEQ2 */ t=T2;n=N2;      SET(4,-3) T = n != t; break;
75 
+			case 0x0a: /* GTH  */ t=T;n=N;        SET(2,-1) T = n > t; break;
76 
+			case 0x2a: /* GTH2 */ t=T2;n=N2;      SET(4,-3) T = n > t; break;
77 
+			case 0x0b: /* LTH  */ t=T;n=N;        SET(2,-1) T = n < t; break;
78 
+			case 0x2b: /* LTH2 */ t=T2;n=N2;      SET(4,-3) T = n < t; break;
80 79 
 			case 0x0c: /* JMP  */ t=T;            SET(1,-1) pc += (Sint8)t; break;
81 
-			case 0x2c:            t=T2;           SET(2,-2) pc = t; break;
80 
+			case 0x2c: /* JMP2 */ t=T2;           SET(2,-2) pc = t; break;
82 81 
 			case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) if(n) pc += (Sint8)t; break;
83 
-			case 0x2d:            t=T2;n=L;       SET(3,-3) if(n) pc = t; break;
84 
-			case 0x0e: /* JSR  */ t=T;            SET(1,-1) FLIP SET(0,2) PUT2(0, pc) pc += (Sint8)t; break;
85 
-			case 0x2e:            t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(0, pc) pc = t; break;
86 
-			case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SET(0,1) PUT(0, t) break;
87 
-			case 0x2f:            t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(0, t) break;
88 
-			case 0x10: /* LDZ  */ t=T;            SET(1, 0) PUT(0, ram[t]) break;
89 
-			case 0x30:            t=T;            SET(1, 1) PUT2(0, PEEK2(ram + t)) break;
82 
+			case 0x2d: /* JCN2 */ t=T2;n=L;       SET(3,-3) if(n) pc = t; break;
83 
+			case 0x0e: /* JSR  */ t=T;            SET(1,-1) FLIP SHIFT(2) T2_(pc) pc += (Sint8)t; break;
84 
+			case 0x2e: /* JSR2 */ t=T2;           SET(2,-2) FLIP SHIFT(2) T2_(pc) pc = t; break;
85 
+			case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SHIFT(1) T = t; break;
86 
+			case 0x2f: /* STH2 */ t=T2;           SET(2,-2) FLIP SHIFT(2) T2_(t) break;
87 
+			case 0x10: /* LDZ  */ t=T;            SET(1, 0) T = ram[t]; break;
88 
+			case 0x30: /* LDZ2 */ t=T;            SET(1, 1) rr = ram + t; T2_(PEEK2(rr)) break;
90 89 
 			case 0x11: /* STZ  */ t=T;n=N;        SET(2,-2) ram[t] = n; break;
91 
-			case 0x31:            t=T;n=H2;       SET(3,-3) POKE2(ram + t, n) break;
92 
-			case 0x12: /* LDR  */ t=T;            SET(1, 0) PUT(0, ram[pc + (Sint8)t]) break;
93 
-			case 0x32:            t=T;            SET(1, 1) PUT2(0, PEEK2(ram + pc + (Sint8)t)) break;
90 
+			case 0x31: /* STZ2 */ t=T;n=H2;       SET(3,-3) rr = ram + t; POKE2(rr, n) break;
91 
+			case 0x12: /* LDR  */ t=T;            SET(1, 0) T = ram[pc + (Sint8)t]; break;
92 
+			case 0x32: /* LDR2 */ t=T;            SET(1, 1) rr = ram + pc + (Sint8)t; T2_(PEEK2(rr)) break;
94 93 
 			case 0x13: /* STR  */ t=T;n=N;        SET(2,-2) ram[pc + (Sint8)t] = n; break;
95 
-			case 0x33:            t=T;n=H2;       SET(3,-3) POKE2(ram + pc + (Sint8)t, n) break;
96 
-			case 0x14: /* LDA  */ t=T2;           SET(2,-1) PUT(0, ram[t]) break;
97 
-			case 0x34:            t=T2;           SET(2, 0) PUT2(0, PEEK2(ram + t)) break;
94 
+			case 0x33: /* STR2 */ t=T;n=H2;       SET(3,-3) rr = ram + pc + (Sint8)t; POKE2(rr, n) break;
95 
+			case 0x14: /* LDA  */ t=T2;           SET(2,-1) T = ram[t]; break;
96 
+			case 0x34: /* LDA2 */ t=T2;           SET(2, 0) rr = ram + t; T2_(PEEK2(rr)) break;
98 97 
 			case 0x15: /* STA  */ t=T2;n=L;       SET(3,-3) ram[t] = n; break;
99 
-			case 0x35:            t=T2;n=N2;      SET(4,-4) POKE2(ram + t, n) break;
100 
-			case 0x16: /* DEI  */ t=T;            SET(1, 0) PUT(0, DEI(t)) break;
101 
-			case 0x36:            t=T;            SET(1, 1) PUT(1, DEI(t)) PUT(0, DEI(t + 1)) break;
98 
+			case 0x35: /* STA2 */ t=T2;n=N2;      SET(4,-4) rr = ram + t; POKE2(rr, n) break;
99 
+			case 0x16: /* DEI  */ t=T;            SET(1, 0) T = DEI(t); break;
100 
+			case 0x36: /* DEI2 */ t=T;            SET(1, 1) T = DEI(t + 1); N = DEI(t); break;
102 101 
 			case 0x17: /* DEO  */ t=T;n=N;        SET(2,-2) DEO(t, n) break;
103 
-			case 0x37:            t=T;n=N;l=L;    SET(3,-3) DEO(t, l) DEO((t + 1), n) break;
104 
-			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) PUT(0, n + t) break;
105 
-			case 0x38:            t=T2;n=N2;      SET(4,-2) PUT2(0, n + t) break;
106 
-			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) PUT(0, n - t) break;
107 
-			case 0x39:            t=T2;n=N2;      SET(4,-2) PUT2(0, n - t) break;
108 
-			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) PUT(0, n * t) break;
109 
-			case 0x3a:            t=T2;n=N2;      SET(4,-2) PUT2(0, n * t) break;
110 
-			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) if(!t) HALT(3) PUT(0, n / t) break;
111 
-			case 0x3b:            t=T2;n=N2;      SET(4,-2) if(!t) HALT(3) PUT2(0, n / t) break;
112 
-			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) PUT(0, n & t) break;
113 
-			case 0x3c:            t=T2;n=N2;      SET(4,-2) PUT2(0, n & t) break;
114 
-			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) PUT(0, n | t) break;
115 
-			case 0x3d:            t=T2;n=N2;      SET(4,-2) PUT2(0, n | t) break;
116 
-			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) PUT(0, n ^ t) break;
117 
-			case 0x3e:            t=T2;n=N2;      SET(4,-2) PUT2(0, n ^ t) break;
118 
-			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) PUT(0, n >> (t & 0xf) << (t >> 4)) break;
119 
-			case 0x3f:            t=T;n=H2;       SET(3,-1) PUT2(0, n >> (t & 0xf) << (t >> 4)) break;
102 
+			case 0x37: /* DEO2 */ t=T;n=N;l=L;    SET(3,-3) DEO(t, l) DEO((t + 1), n) break;
103 
+			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) T = n + t; break;
104 
+			case 0x38: /* ADD2 */ t=T2;n=N2;      SET(4,-2) T2_(n + t) break;
105 
+			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) T = n - t; break;
106 
+			case 0x39: /* SUB2 */ t=T2;n=N2;      SET(4,-2) T2_(n - t) break;
107 
+			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) T = n * t; break;
108 
+			case 0x3a: /* MUL2 */ t=T2;n=N2;      SET(4,-2) T2_(n * t) break;
109 
+			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) T = t ? n / t : 0; break;
110 
+			case 0x3b: /* DIV2 */ t=T2;n=N2;      SET(4,-2) T2_(t ? n / t : 0) break;
111 
+			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) T = n & t; break;
112 
+			case 0x3c: /* AND2 */ t=T2;n=N2;      SET(4,-2) T2_(n & t) break;
113 
+			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) T = n | t; break;
114 
+			case 0x3d: /* ORA2 */ t=T2;n=N2;      SET(4,-2) T2_(n | t) break;
115 
+			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) T = n ^ t; break;
116 
+			case 0x3e: /* EOR2 */ t=T2;n=N2;      SET(4,-2) T2_(n ^ t) break;
117 
+			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) T = n >> (t & 0xf) << (t >> 4); break;
118 
+			case 0x3f: /* SFT2 */ t=T;n=H2;       SET(3,-1) T2_(n >> (t & 0xf) << (t >> 4)) break;
120 119 
 		}
121 120 
 	}
122 121 
 }
123 
-
124 
-int
125 
-uxn_boot(Uxn *u, Uint8 *ram)
126 
-{
127 
-	Uint32 i;
128 
-	char *cptr = (char *)u;
129 
-	for(i = 0; i < sizeof(*u); i++)
130 
-		cptr[i] = 0;
131 
-	u->ram = ram;
132 
-	return 1;
133 
-}
etc/cores/uxn.h
History View file @ 5abea12
134 122 
deleted file mode 100644
... ... 
@@ -1,50 +0,0 @@
1 
-/*
2 
-Copyright (c) 2021 Devine Lu Linvega
3 
-
4 
-Permission to use, copy, modify, and distribute this software for any
5 
-purpose with or without fee is hereby granted, provided that the above
6 
-copyright notice and this permission notice appear in all copies.
7 
-
8 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 
-WITH REGARD TO THIS SOFTWARE.
10 
-*/
11 
-
12 
-/* clang-format off */
13 
-
14 
-#define POKE2(d, v) { (d)[0] = (v) >> 8; (d)[1] = (v); }
15 
-#define PEEK2(d) ((d)[0] << 8 | (d)[1])
16 
-#define DEO(p, v) { u->dev[p] = v; if((deo_mask[p >> 4] >> (p & 0xf)) & 0x1) emu_deo(u, p); }
17 
-#define DEI(p) ((dei_mask[(p) >> 4] >> ((p) & 0xf)) & 0x1 ? emu_dei(u, (p)) : u->dev[(p)])
18 
-
19 
-/* clang-format on */
20 
-
21 
-#define PAGE_PROGRAM 0x0100
22 
-
23 
-typedef unsigned char Uint8;
24 
-typedef signed char Sint8;
25 
-typedef unsigned short Uint16;
26 
-typedef signed short Sint16;
27 
-typedef unsigned int Uint32;
28 
-
29 
-typedef struct {
30 
-	Uint8 dat[255], ptr;
31 
-} Stack;
32 
-
33 
-typedef struct Uxn {
34 
-	Uint8 *ram, dev[256];
35 
-	Stack wst, rst;
36 
-	Uint8 (*dei)(struct Uxn *u, Uint8 addr);
37 
-	void (*deo)(struct Uxn *u, Uint8 addr);
38 
-} Uxn;
39 
-
40 
-/* required functions */
41 
-
42 
-extern Uint8 emu_dei(Uxn *u, Uint8 addr);
43 
-extern void emu_deo(Uxn *u, Uint8 addr);
44 
-extern int emu_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr);
45 
-extern Uint16 dev_vers[0x10], dei_mask[0x10], deo_mask[0x10];
46 
-
47 
-/* built-ins */
48 
-
49 
-int uxn_boot(Uxn *u, Uint8 *ram);
50 
-int uxn_eval(Uxn *u, Uint16 pc);