Dariaceli's Git
Browse code

Removed DEI/DEO from uxn-tnl core

neauoire authored on 08/08/2023 16:23:11
Showing 6 changed files
etc/archives/uxn.c
History View file @ a1d2bfb
1 1 
deleted file mode 100644
... ... 
@@ -1,104 +0,0 @@
1 
-#include <stdio.h>
2 
-#include "uxn.h"
3 
-
4 
-/*
5 
-Copyright (u) 2022-2023 Devine Lu Linvega, Andrew Alderwick, Andrew Richards
6 
-
7 
-Permission to use, copy, modify, and distribute this software for any
8 
-purpose with or without fee is hereby granted, provided that the above
9 
-copyright notice and this permission notice appear in all copies.
10 
-
11 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 
-WITH REGARD TO THIS SOFTWARE.
13 
-*/
14 
-
15 
-#define HALT(c) { return emu_halt(u, instr, (c), pc - 1); }
16 
-#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
17 
-#define PUSH8(x) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (x); }
18 
-#define PUSH16(x) { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (x); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; }
19 
-#define PUSH(x) { if(m2) { PUSH16(x) } else { PUSH8(x) } }
20 
-#define POP8(o) { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
21 
-#define POP16(o) { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
22 
-#define POP(o) { if(m2) { POP16(o) } else { POP8(o) } }
23 
-#define POKE(x, y) { if(m2) { t = (y); POKE2(u->ram + x, t) } else { u->ram[(x)] = (y); } }
24 
-#define PEEK(o, x) { if(m2) { o = PEEK2(u->ram + x); } else o = u->ram[(x)]; }
25 
-#define DEI(port) {  }
26 
-#define DEO(port, value) { u->dev[(port)] = (value); if((deo_mask[(port) >> 4] >> ((port) & 0xf)) & 0x1) emu_deo(u, (port)); }
27 
-#define DEVR(dest, port) { if(m2) { dest = (emu_dei(u, (port)) << 8) + emu_dei(u, (port+1)); } else { dest = emu_dei(u, (port)); } }
28 
-#define DEVW(port, value) { if(m2) { DEO((port),(value >> 8)) DEO((port+1),(value)) } else { DEO((port),(value)) } }
29 
-
30 
-int
31 
-uxn_eval(Uxn *u, Uint16 pc)
32 
-{
33 
-	Uint8 instr, opcode, m2, ksp, tsp, *sp;
34 
-	Uint16 a, b, c, t;
35 
-	Stack *s;
36 
-	if(!pc || u->dev[0x0f]) return 0;
37 
-	for(;;) {
38 
-		instr = u->ram[pc++];
39 
-		/* printf("%02x\n", instr); */
40 
-		opcode = instr & 0x1f;
41 
-		/* Short Mode */
42 
-		m2 = instr & 0x20;
43 
-		/* Return Mode */
44 
-		s = instr & 0x40 ? &u->rst : &u->wst;
45 
-		/* Keep Mode */
46 
-		if(instr & 0x80) { ksp = s->ptr; sp = &ksp; }
47 
-		else sp = &s->ptr;
48 
-		/* Opcodes */
49 
-		switch(opcode - (!opcode * (instr >> 5))) {
50 
-		/* Immediate */
51 
-		case -0x0: /* BRK */ return 1;
52 
-		case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; } /* else fallthrough */
53 
-		case -0x2: /* JMI */ pc += PEEK2(u->ram + pc) + 2; break;
54 
-		case -0x3: /* JSI */ s = &u->rst; PUSH16(pc + 2) pc += PEEK2(u->ram + pc) + 2; break;
55 
-		case -0x4: /* LIT */
56 
-		case -0x6: /* LITr */ a = u->ram[pc++]; PUSH8(a) break;
57 
-		case -0x5: /* LIT2 */
58 
-		case -0x7: /* LIT2r */ PUSH16(PEEK2(u->ram + pc)) pc += 2; break;
59 
-		/* ALU */
60 
-		case 0x01: /* INC */ POP(a) PUSH(a + 1) break;
61 
-		case 0x02: /* POP */ POP(a) break;
62 
-		case 0x03: /* NIP */ POP(a) POP(b) PUSH(a) break;
63 
-		case 0x04: /* SWP */ POP(a) POP(b) PUSH(a) PUSH(b) break;
64 
-		case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(b) PUSH(a) PUSH(c) break;
65 
-		case 0x06: /* DUP */ POP(a) PUSH(a) PUSH(a) break;
66 
-		case 0x07: /* OVR */ POP(a) POP(b) PUSH(b) PUSH(a) PUSH(b) break;
67 
-		case 0x08: /* EQU */ POP(a) POP(b) PUSH8(b == a) break;
68 
-		case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(b != a) break;
69 
-		case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(b > a) break;
70 
-		case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(b < a) break;
71 
-		case 0x0c: /* JMP */ POP(a) JUMP(a) break;
72 
-		case 0x0d: /* JCN */ POP(a) POP8(b) if(b) JUMP(a) break;
73 
-		case 0x0e: /* JSR */ POP(a) s = (instr & 0x40) ? &u->wst : &u->rst; PUSH16(pc) JUMP(a) break;
74 
-		case 0x0f: /* STH */ POP(a) s = (instr & 0x40) ? &u->wst : &u->rst; PUSH(a) break;
75 
-		case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(b) break;
76 
-		case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break;
77 
-		case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(b) break;
78 
-		case 0x13: /* STR */ POP8(a) POP(b) POKE(pc + (Sint8)a, b) break;
79 
-		case 0x14: /* LDA */ POP16(a) PEEK(b, a) PUSH(b) break;
80 
-		case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) break;
81 
-		case 0x16: /* DEI */ POP8(a) DEVR(b, a) PUSH(b) break;
82 
-		case 0x17: /* DEO */ POP8(a) POP(b) DEVW(a, b) break;
83 
-		case 0x18: /* ADD */ POP(a) POP(b) PUSH(b + a) break;
84 
-		case 0x19: /* SUB */ POP(a) POP(b) PUSH(b - a) break;
85 
-		case 0x1a: /* MUL */ POP(a) POP(b) PUSH((Uint32)b * a) break;
86 
-		case 0x1b: /* DIV */ POP(a) POP(b) if(!a) HALT(3) PUSH(b / a) break;
87 
-		case 0x1c: /* AND */ POP(a) POP(b) PUSH(b & a) break;
88 
-		case 0x1d: /* ORA */ POP(a) POP(b) PUSH(b | a) break;
89 
-		case 0x1e: /* EOR */ POP(a) POP(b) PUSH(b ^ a) break;
90 
-		case 0x1f: /* SFT */ POP8(a) POP(b) PUSH(b >> (a & 0x0f) << ((a & 0xf0) >> 4)) break;
91 
-		}
92 
-	}
93 
-}
94 
-
95 
-int
96 
-uxn_boot(Uxn *u, Uint8 *ram)
97 
-{
98 
-	Uint32 i;
99 
-	char *cptr = (char *)u;
100 
-	for(i = 0; i < sizeof(*u); i++)
101 
-		cptr[i] = 0;
102 
-	u->ram = ram;
103 
-	return 1;
104 
-}
etc/cores/uxn-abc.c
History View file @ a1d2bfb
105 0 
new file mode 100644
... ... 
@@ -0,0 +1,98 @@
1 
+#include "uxn.h"
2 
+
3 
+/*
4 
+Copyright (u) 2022-2023 Devine Lu Linvega, Andrew Alderwick, Andrew Richards
5 
+
6 
+Permission to use, copy, modify, and distribute this software for any
7 
+purpose with or without fee is hereby granted, provided that the above
8 
+copyright notice and this permission notice appear in all copies.
9 
+
10 
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 
+WITH REGARD TO THIS SOFTWARE.
12 
+*/
13 
+
14 
+#define HALT(c)    { return emu_halt(u, ins, (c), pc - 1); }
15 
+#define FLIP       { s = ins & 0x40 ? &u->wst : &u->rst; }
16 
+#define JUMP(x)    { if(m2) pc = (x); else pc += (Sint8)(x); }
17 
+#define POKE(x, y) { if(m2) { POKE2(ram + x, y) } else { ram[(x)] = (y); } }
18 
+#define PEEK(o, x) { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; }
19 
+#define PUSH1(y)   { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (y); }
20 
+#define PUSH2(y)   { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (y); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; }
21 
+#define PUSHx(y)   { if(m2) { PUSH2(y) } else { PUSH1(y) } }
22 
+#define POP1(o)    { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
23 
+#define POP2(o)    { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
24 
+#define POPx(o)    { if(m2) { POP2(o) } else { POP1(o) } }
25 
+#define DEVW(p, y) { if(m2) { DEO(p, y >> 8) DEO((p + 1), y) } else { DEO(p, y) } }
26 
+#define DEVR(o, p) { if(m2) { o = ((DEI(p) << 8) + DEI(p + 1)); } else { o = DEI(p); } }
27 
+
28 
+int
29 
+uxn_eval(Uxn *u, Uint16 pc)
30 
+{
31 
+	Uint8 ins, opc, m2, ksp, tsp, *sp, *ram = u->ram;
32 
+	Uint16 a, b, c, t;
33 
+	Stack *s;
34 
+	if(!pc || u->dev[0x0f]) return 0;
35 
+	for(;;) {
36 
+		ins = ram[pc++];
37 
+		/* modes */
38 
+		opc = ins & 0x1f;
39 
+		m2 = ins & 0x20;
40 
+		s = ins & 0x40 ? &u->rst : &u->wst;
41 
+		if(ins & 0x80) { ksp = s->ptr; sp = &ksp; } else sp = &s->ptr;
42 
+		/* Opcodes */
43 
+		switch(opc - (!opc * (ins >> 5))) {
44 
+		/* Immediate */
45 
+		case -0x0: /* BRK   */ return 1;
46 
+		case -0x1: /* JCI   */ POP1(b) if(!b) { pc += 2; break; } /* else fallthrough */
47 
+		case -0x2: /* JMI   */ pc += PEEK2(ram + pc) + 2; break;
48 
+		case -0x3: /* JSI   */ PUSH2(pc + 2) pc += PEEK2(ram + pc) + 2; break;
49 
+		case -0x4: /* LIT   */
50 
+		case -0x6: /* LITr  */ PUSH1(ram[pc++]) break;
51 
+		case -0x5: /* LIT2  */
52 
+		case -0x7: /* LIT2r */ PUSH2(PEEK2(ram + pc)) pc += 2; break;
53 
+		/* ALU */
54 
+		case 0x01: /* INC */ POPx(a) PUSHx(a + 1) break;
55 
+		case 0x02: /* POP */ POPx(a) break;
56 
+		case 0x03: /* NIP */ POPx(a) POPx(b) PUSHx(a) break;
57 
+		case 0x04: /* SWP */ POPx(a) POPx(b) PUSHx(a) PUSHx(b) break;
58 
+		case 0x05: /* ROT */ POPx(a) POPx(b) POPx(c) PUSHx(b) PUSHx(a) PUSHx(c) break;
59 
+		case 0x06: /* DUP */ POPx(a) PUSHx(a) PUSHx(a) break;
60 
+		case 0x07: /* OVR */ POPx(a) POPx(b) PUSHx(b) PUSHx(a) PUSHx(b) break;
61 
+		case 0x08: /* EQU */ POPx(a) POPx(b) PUSH1(b == a) break;
62 
+		case 0x09: /* NEQ */ POPx(a) POPx(b) PUSH1(b != a) break;
63 
+		case 0x0a: /* GTH */ POPx(a) POPx(b) PUSH1(b > a) break;
64 
+		case 0x0b: /* LTH */ POPx(a) POPx(b) PUSH1(b < a) break;
65 
+		case 0x0c: /* JMP */ POPx(a) JUMP(a) break;
66 
+		case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break;
67 
+		case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break;
68 
+		case 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break;
69 
+		case 0x10: /* LDZ */ POP1(a) PEEK(b, a) PUSHx(b) break;
70 
+		case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b) break;
71 
+		case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a) PUSHx(b) break;
72 
+		case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b) break;
73 
+		case 0x14: /* LDA */ POP2(a) PEEK(b, a) PUSHx(b) break;
74 
+		case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b) break;
75 
+		case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break;
76 
+		case 0x17: /* DEO */ POP1(a) POPx(b) DEVW(a, b) break;
77 
+		case 0x18: /* ADD */ POPx(a) POPx(b) PUSHx(b + a) break;
78 
+		case 0x19: /* SUB */ POPx(a) POPx(b) PUSHx(b - a) break;
79 
+		case 0x1a: /* MUL */ POPx(a) POPx(b) PUSHx((Uint32)b * a) break;
80 
+		case 0x1b: /* DIV */ POPx(a) POPx(b) if(!a) HALT(3) PUSHx(b / a) break;
81 
+		case 0x1c: /* AND */ POPx(a) POPx(b) PUSHx(b & a) break;
82 
+		case 0x1d: /* ORA */ POPx(a) POPx(b) PUSHx(b | a) break;
83 
+		case 0x1e: /* EOR */ POPx(a) POPx(b) PUSHx(b ^ a) break;
84 
+		case 0x1f: /* SFT */ POP1(a) POPx(b) PUSHx(b >> (a & 0xf) << (a >> 4)) break;
85 
+		}
86 
+	}
87 
+}
88 
+
89 
+int
90 
+uxn_boot(Uxn *u, Uint8 *ram)
91 
+{
92 
+	Uint32 i;
93 
+	char *cptr = (char *)u;
94 
+	for(i = 0; i < sizeof(*u); i++)
95 
+		cptr[i] = 0;
96 
+	u->ram = ram;
97 
+	return 1;
98 
+}
etc/archives/uxn-registers.c
History View file @ a1d2bfb
0 99 
similarity index 94%
1 100 
rename from etc/archives/uxn-registers.c
2 101 
rename to etc/cores/uxn-tnl.c
... ... 
@@ -30,8 +30,6 @@ WITH REGARD TO THIS SOFTWARE.
30 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; }
31 31 
 #define PUT(o, v)  { s->dat[(s->ptr - 1 - (o))] = (v); }
32 32 
 #define PUT2(o, v) { tmp = (v); POKE2(s->dat + (s->ptr - o - 2), tmp); }
33 
-#define DEO(a, b)  { u->dev[(a)] = (b); if((deo_mask[(a) >> 4] >> ((a) & 0xf)) & 0x1) emu_deo(u, (a)); }
34 
-#define DEI(a, b)  { PUT((a), ((dei_mask[(b) >> 4] >> ((b) & 0xf)) & 0x1) ? emu_dei(u, (b)) : u->dev[(b)]) }
35 33
36 34 
 int
37 35 
 uxn_eval(Uxn *u, Uint16 pc)
... ... 
@@ -98,10 +96,10 @@ uxn_eval(Uxn *u, Uint16 pc)
98 96 
 			case 0x34:            t=T2;           SET(2, 0) PUT2(0, PEEK2(ram + t)) break;
99 97 
 			case 0x15: /* STA  */ t=T2;n=L;       SET(3,-3) ram[t] = n; break;
100 98 
 			case 0x35:            t=T2;n=N2;      SET(4,-4) POKE2(ram + t, n) break;
101 
-			case 0x16: /* DEI  */ t=T;            SET(1, 0) DEI(0, t) break;
102 
-			case 0x36:            t=T;            SET(1, 1) DEI(1, t) DEI(0, t + 1) break;
99 
+			case 0x16: /* DEI  */ t=T;            SET(1, 0) PUT(0, DEI(t)) break;
100 
+			case 0x36:            t=T;            SET(1, 1) PUT(1, DEI(t)) PUT(0, DEI(t + 1)) break;
103 101 
 			case 0x17: /* DEO  */ t=T;n=N;        SET(2,-2) DEO(t, n) break;
104 
-			case 0x37:            t=T;n=N;l=L;    SET(3,-3) DEO(t, l) DEO(t + 1, n) break;
102 
+			case 0x37:            t=T;n=N;l=L;    SET(3,-3) DEO(t, l) DEO((t + 1), n) break;
105 103 
 			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) PUT(0, n + t) break;
106 104 
 			case 0x38:            t=T2;n=N2;      SET(4,-2) PUT2(0, n + t) break;
107 105 
 			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) PUT(0, n - t) break;
etc/cores/uxn.h
History View file @ a1d2bfb
108 106 
new file mode 100644
... ... 
@@ -0,0 +1,51 @@
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 
+#define PAGE_PROGRAM 0x0100
13 
+
14 
+/* clang-format off */
15 
+
16 
+#define POKE2(d, v) { (d)[0] = (v) >> 8; (d)[1] = (v); }
17 
+#define PEEK2(d) ((d)[0] << 8 | (d)[1])
18 
+#define DEO(p, value) { u->dev[p] = value; if((deo_mask[p >> 4] >> (p & 0xf)) & 0x1) emu_deo(u, p); }
19 
+#define DEI(p) ((dei_mask[(p) >> 4] >> ((p) & 0xf)) & 0x1 ? emu_dei(u, (p)) : u->dev[(p)])
20 
+
21 
+/* clang-format on */
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 dei_mask[];
46 
+extern Uint16 deo_mask[];
47 
+
48 
+/* built-ins */
49 
+
50 
+int uxn_boot(Uxn *u, Uint8 *ram);
51 
+int uxn_eval(Uxn *u, Uint16 pc);
src/uxn.c
History View file @ a1d2bfb
... ... 
@@ -23,7 +23,7 @@ WITH REGARD TO THIS SOFTWARE.
23 23 
 #define POP2(o)    { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
24 24 
 #define POPx(o)    { if(m2) { POP2(o) } else { POP1(o) } }
25 25 
 #define DEVW(p, y) { if(m2) { DEO(p, y >> 8) DEO((p + 1), y) } else { DEO(p, y) } }
26 
-#define DEVR(o, p) { if(m2) { o = ((DEI(p) << 8) + DEI(p + 1)); } else { o = DEI(p); } }
26 
+#define DEVR(o, p) { if(m2) { o = DEI(p) << 8 | DEI(p + 1); } else { o = DEI(p); } }
27 27
28 28 
 int
29 29 
 uxn_eval(Uxn *u, Uint16 pc)
src/uxn.h
History View file @ a1d2bfb
... ... 
@@ -15,7 +15,7 @@ WITH REGARD TO THIS SOFTWARE.
15 15
16 16 
 #define POKE2(d, v) { (d)[0] = (v) >> 8; (d)[1] = (v); }
17 17 
 #define PEEK2(d) ((d)[0] << 8 | (d)[1])
18 
-#define DEO(p, value) { u->dev[p] = value; if((deo_mask[p >> 4] >> (p & 0xf)) & 0x1) emu_deo(u, p); }
18 
+#define DEO(p, v) { u->dev[p] = v; if((deo_mask[p >> 4] >> (p & 0xf)) & 0x1) emu_deo(u, p); }
19 19 
 #define DEI(p) ((dei_mask[(p) >> 4] >> ((p) & 0xf)) & 0x1 ? emu_dei(u, (p)) : u->dev[(p)])
20 20
21 21 
 /* clang-format on */