Dariaceli's Git
Browse code

(uxn.c) Reconnected old core

neauoire authored on 07/08/2023 19:20:50
Showing 2 changed files
etc/archives/uxn-registers.c
History View file @ 6d7696a
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,134 @@
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 
+/* Registers
15 
+[ . ][ . ][ . ][ L ][ N ][ T ] <
16 
+[ . ][ . ][ . ][   H2   ][ T ] <
17 
+[   L2   ][   N2   ][   T2   ] <
18 
+*/
19 
+
20 
+#define T s->dat[s->ptr - 1]
21 
+#define N s->dat[s->ptr - 2]
22 
+#define L s->dat[s->ptr - 3]
23 
+#define T2 PEEK2(s->dat + s->ptr - 2)
24 
+#define H2 PEEK2(s->dat + s->ptr - 3)
25 
+#define N2 PEEK2(s->dat + s->ptr - 4)
26 
+#define L2 PEEK2(s->dat + s->ptr - 6)
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; }
31 
+#define PUT(o, v)  { s->dat[(s->ptr - 1 - (o))] = (v); }
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 
+
36 
+int
37 
+uxn_eval(Uxn *u, Uint16 pc)
38 
+{
39 
+	int t, n, l, k, tmp, ins, opc;
40 
+	Uint8 *ram = u->ram;
41 
+	Stack *s;
42 
+	if(!pc || u->dev[0x0f]) return 0;
43 
+	for(;;) {
44 
+		ins = ram[pc++];
45 
+		k = ins & 0x80 ? 0xff : 0;
46 
+		s = ins & 0x40 ? &u->rst : &u->wst;
47 
+		opc = !(ins & 0x1f) ? (0 - (ins >> 5)) & 0xff : ins & 0x3f;
48 
+		switch(opc) {
49 
+			/* IMM */
50 
+			case 0x00: /* BRK   */                          return 1;
51 
+			case 0xff: /* JCI   */                          if(!s->dat[--s->ptr]) { pc += 2; break; }
52 
+			case 0xfe: /* JMI   */                          pc += PEEK2(ram + pc) + 2; break;
53 
+			case 0xfd: /* JSI   */                SET(0, 2) PUT2(0, pc + 2) pc += PEEK2(ram + pc) + 2; break;
54 
+			case 0xfc: /* LIT   */                SET(0, 1) PUT(0, ram[pc++]) break;
55 
+			case 0xfb: /* LIT2  */                SET(0, 2) PUT2(0, PEEK2(ram + pc)) pc += 2; break;
56 
+			case 0xfa: /* LITr  */                SET(0, 1) PUT(0, ram[pc++]) break;
57 
+			case 0xf9: /* LIT2r */                SET(0, 2) PUT2(0, PEEK2(ram + pc)) pc += 2; break;
58 
+			/* ALU */
59 
+			case 0x01: /* INC  */ t=T;            SET(1, 0) PUT(0, t + 1) break;
60 
+			case 0x21:            t=T2;           SET(2, 0) PUT2(0, t + 1) break;
61 
+			case 0x02: /* POP  */                 SET(1,-1) break;
62 
+			case 0x22:                            SET(2,-2) break;
63 
+			case 0x03: /* NIP  */ t=T;            SET(2,-1) PUT(0, t) break;
64 
+			case 0x23:            t=T2;           SET(4,-2) PUT2(0, t) break;
65 
+			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) PUT(0, n) PUT(1, t) break;
66 
+			case 0x24:            t=T2;n=N2;      SET(4, 0) PUT2(0, n) PUT2(2, t) break;
67 
+			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break;
68 
+			case 0x25:            t=T2;n=N2;l=L2; SET(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
69 
+			case 0x06: /* DUP  */ t=T;            SET(1, 1) PUT(0, t) PUT(1, t) break;
70 
+			case 0x26:            t=T2;           SET(2, 2) PUT2(0, t) PUT2(2, t) break;
71 
+			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break;
72 
+			case 0x27:            t=T2;n=N2;      SET(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
73 
+			case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) PUT(0, n == t) break;
74 
+			case 0x28:            t=T2;n=N2;      SET(4,-3) PUT(0, n == t) break;
75 
+			case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) PUT(0, n != t) break;
76 
+			case 0x29:            t=T2;n=N2;      SET(4,-3) PUT(0, n != t) break;
77 
+			case 0x0a: /* GTH  */ t=T;n=N;        SET(2,-1) PUT(0, n > t) break;
78 
+			case 0x2a:            t=T2;n=N2;      SET(4,-3) PUT(0, n > t) break;
79 
+			case 0x0b: /* LTH  */ t=T;n=N;        SET(2,-1) PUT(0, n < t) break;
80 
+			case 0x2b:            t=T2;n=N2;      SET(4,-3) PUT(0, n < t) break;
81 
+			case 0x0c: /* JMP  */ t=T;            SET(1,-1) pc += (Sint8)t; break;
82 
+			case 0x2c:            t=T2;           SET(2,-2) pc = t; break;
83 
+			case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) if(n) pc += (Sint8)t; break;
84 
+			case 0x2d:            t=T2;n=L;       SET(3,-3) if(n) pc = t; break;
85 
+			case 0x0e: /* JSR  */ t=T;            SET(1,-1) FLIP SET(0,2) PUT2(0, pc) pc += (Sint8)t; break;
86 
+			case 0x2e:            t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(0, pc) pc = t; break;
87 
+			case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SET(0,1) PUT(0, t) break;
88 
+			case 0x2f:            t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(0, t) break;
89 
+			case 0x10: /* LDZ  */ t=T;            SET(1, 0) PUT(0, ram[t]) break;
90 
+			case 0x30:            t=T;            SET(1, 1) PUT2(0, PEEK2(ram + t)) break;
91 
+			case 0x11: /* STZ  */ t=T;n=N;        SET(2,-2) ram[t] = n; break;
92 
+			case 0x31:            t=T;n=H2;       SET(3,-3) POKE2(ram + t, n) break;
93 
+			case 0x12: /* LDR  */ t=T;            SET(1, 0) PUT(0, ram[pc + (Sint8)t]) break;
94 
+			case 0x32:            t=T;            SET(1, 1) PUT2(0, PEEK2(ram + pc + (Sint8)t)) break;
95 
+			case 0x13: /* STR  */ t=T;n=N;        SET(2,-2) ram[pc + (Sint8)t] = n; break;
96 
+			case 0x33:            t=T;n=H2;       SET(3,-3) POKE2(ram + pc + (Sint8)t, n) break;
97 
+			case 0x14: /* LDA  */ t=T2;           SET(2,-1) PUT(0, ram[t]) break;
98 
+			case 0x34:            t=T2;           SET(2, 0) PUT2(0, PEEK2(ram + t)) break;
99 
+			case 0x15: /* STA  */ t=T2;n=L;       SET(3,-3) ram[t] = n; break;
100 
+			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;
103 
+			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;
105 
+			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) PUT(0, n + t) break;
106 
+			case 0x38:            t=T2;n=N2;      SET(4,-2) PUT2(0, n + t) break;
107 
+			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) PUT(0, n - t) break;
108 
+			case 0x39:            t=T2;n=N2;      SET(4,-2) PUT2(0, n - t) break;
109 
+			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) PUT(0, n * t) break;
110 
+			case 0x3a:            t=T2;n=N2;      SET(4,-2) PUT2(0, n * t) break;
111 
+			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) if(!t) HALT(3) PUT(0, n / t) break;
112 
+			case 0x3b:            t=T2;n=N2;      SET(4,-2) if(!t) HALT(3) PUT2(0, n / t) break;
113 
+			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) PUT(0, n & t) break;
114 
+			case 0x3c:            t=T2;n=N2;      SET(4,-2) PUT2(0, n & t) break;
115 
+			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) PUT(0, n | t) break;
116 
+			case 0x3d:            t=T2;n=N2;      SET(4,-2) PUT2(0, n | t) break;
117 
+			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) PUT(0, n ^ t) break;
118 
+			case 0x3e:            t=T2;n=N2;      SET(4,-2) PUT2(0, n ^ t) break;
119 
+			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) PUT(0, n >> (t & 0xf) << (t >> 4)) break;
120 
+			case 0x3f:            t=T;n=H2;       SET(3,-1) PUT2(0, n >> (t & 0xf) << (t >> 4)) break;
121 
+		}
122 
+	}
123 
+}
124 
+
125 
+int
126 
+uxn_boot(Uxn *u, Uint8 *ram)
127 
+{
128 
+	Uint32 i;
129 
+	char *cptr = (char *)u;
130 
+	for(i = 0; i < sizeof(*u); i++)
131 
+		cptr[i] = 0;
132 
+	u->ram = ram;
133 
+	return 1;
134 
+}
src/uxn.c
History View file @ 6d7696a
... ... 
@@ -11,113 +11,79 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 11 
 WITH REGARD TO THIS SOFTWARE.
12 12 
 */
13 13
14 
-/* Registers
15 
-[ . ][ . ][ . ][ L ][ N ][ T ] <
16 
-[ . ][ . ][ . ][   H2   ][ T ] <
17 
-[   L2   ][   N2   ][   T2   ] <
18 
-*/
19 
-
20 
-#define T s->dat[s->ptr - 1]
21 
-#define N s->dat[s->ptr - 2]
22 
-#define L s->dat[s->ptr - 3]
23 
-#define T2 PEEK2(s->dat + s->ptr - 2)
24 
-#define H2 PEEK2(s->dat + s->ptr - 3)
25 
-#define N2 PEEK2(s->dat + s->ptr - 4)
26 
-#define L2 PEEK2(s->dat + s->ptr - 6)
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; }
31 
-#define PUT(o, v)  { s->dat[(s->ptr - 1 - (o))] = (v); }
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)]) }
14 
+#define HALT(c) { return emu_halt(u, ins, (c), pc - 1); }
15 
+#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
16 
+#define PUSH8(x) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (x); }
17 
+#define PUSH16(x) { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (x); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; }
18 
+#define PUSH(x) { if(m2) { PUSH16(x) } else { PUSH8(x) } }
19 
+#define POP8(o) { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
20 
+#define POP16(o) { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
21 
+#define POP(o) { if(m2) { POP16(o) } else { POP8(o) } }
22 
+#define POKE(x, y) { if(m2) { t = (y); POKE2(ram + x, t) } else { ram[(x)] = (y); } }
23 
+#define PEEK(o, x) { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; }
24 
+#define FLIP() { s = (ins & 0x40) ? &u->wst : &u->rst; }
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)) } }
35 29
36 30 
 int
37 31 
 uxn_eval(Uxn *u, Uint16 pc)
38 32 
 {
39 
-	int t, n, l, k, tmp, ins, opc;
40 
-	Uint8 *ram = u->ram;
33 
+	Uint8 ins, opc, m2, ksp, tsp, *sp, *ram = u->ram;
34 
+	Uint16 a, b, c, t;
41 35 
 	Stack *s;
42 36 
 	if(!pc || u->dev[0x0f]) return 0;
43 37 
 	for(;;) {
44 38 
 		ins = ram[pc++];
45 
-		k = ins & 0x80 ? 0xff : 0;
39 
+		/* modes */
40 
+		opc = ins & 0x1f;
41 
+		m2 = ins & 0x20;
46 42 
 		s = ins & 0x40 ? &u->rst : &u->wst;
47 
-		opc = !(ins & 0x1f) ? (0 - (ins >> 5)) & 0xff : ins & 0x3f;
48 
-		switch(opc) {
49 
-			/* IMM */
50 
-			case 0x00: /* BRK   */                          return 1;
51 
-			case 0xff: /* JCI   */                          if(!s->dat[--s->ptr]) { pc += 2; break; }
52 
-			case 0xfe: /* JMI   */                          pc += PEEK2(ram + pc) + 2; break;
53 
-			case 0xfd: /* JSI   */                SET(0, 2) PUT2(0, pc + 2) pc += PEEK2(ram + pc) + 2; break;
54 
-			case 0xfc: /* LIT   */                SET(0, 1) PUT(0, ram[pc++]) break;
55 
-			case 0xfb: /* LIT2  */                SET(0, 2) PUT2(0, PEEK2(ram + pc)) pc += 2; break;
56 
-			case 0xfa: /* LITr  */                SET(0, 1) PUT(0, ram[pc++]) break;
57 
-			case 0xf9: /* LIT2r */                SET(0, 2) PUT2(0, PEEK2(ram + pc)) pc += 2; break;
58 
-			/* ALU */
59 
-			case 0x01: /* INC  */ t=T;            SET(1, 0) PUT(0, t + 1) break;
60 
-			case 0x21:            t=T2;           SET(2, 0) PUT2(0, t + 1) break;
61 
-			case 0x02: /* POP  */                 SET(1,-1) break;
62 
-			case 0x22:                            SET(2,-2) break;
63 
-			case 0x03: /* NIP  */ t=T;            SET(2,-1) PUT(0, t) break;
64 
-			case 0x23:            t=T2;           SET(4,-2) PUT2(0, t) break;
65 
-			case 0x04: /* SWP  */ t=T;n=N;        SET(2, 0) PUT(0, n) PUT(1, t) break;
66 
-			case 0x24:            t=T2;n=N2;      SET(4, 0) PUT2(0, n) PUT2(2, t) break;
67 
-			case 0x05: /* ROT  */ t=T;n=N;l=L;    SET(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break;
68 
-			case 0x25:            t=T2;n=N2;l=L2; SET(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
69 
-			case 0x06: /* DUP  */ t=T;            SET(1, 1) PUT(0, t) PUT(1, t) break;
70 
-			case 0x26:            t=T2;           SET(2, 2) PUT2(0, t) PUT2(2, t) break;
71 
-			case 0x07: /* OVR  */ t=T;n=N;        SET(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break;
72 
-			case 0x27:            t=T2;n=N2;      SET(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
73 
-			case 0x08: /* EQU  */ t=T;n=N;        SET(2,-1) PUT(0, n == t) break;
74 
-			case 0x28:            t=T2;n=N2;      SET(4,-3) PUT(0, n == t) break;
75 
-			case 0x09: /* NEQ  */ t=T;n=N;        SET(2,-1) PUT(0, n != t) break;
76 
-			case 0x29:            t=T2;n=N2;      SET(4,-3) PUT(0, n != t) break;
77 
-			case 0x0a: /* GTH  */ t=T;n=N;        SET(2,-1) PUT(0, n > t) break;
78 
-			case 0x2a:            t=T2;n=N2;      SET(4,-3) PUT(0, n > t) break;
79 
-			case 0x0b: /* LTH  */ t=T;n=N;        SET(2,-1) PUT(0, n < t) break;
80 
-			case 0x2b:            t=T2;n=N2;      SET(4,-3) PUT(0, n < t) break;
81 
-			case 0x0c: /* JMP  */ t=T;            SET(1,-1) pc += (Sint8)t; break;
82 
-			case 0x2c:            t=T2;           SET(2,-2) pc = t; break;
83 
-			case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) if(n) pc += (Sint8)t; break;
84 
-			case 0x2d:            t=T2;n=L;       SET(3,-3) if(n) pc = t; break;
85 
-			case 0x0e: /* JSR  */ t=T;            SET(1,-1) FLIP SET(0,2) PUT2(0, pc) pc += (Sint8)t; break;
86 
-			case 0x2e:            t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(0, pc) pc = t; break;
87 
-			case 0x0f: /* STH  */ t=T;            SET(1,-1) FLIP SET(0,1) PUT(0, t) break;
88 
-			case 0x2f:            t=T2;           SET(2,-2) FLIP SET(0,2) PUT2(0, t) break;
89 
-			case 0x10: /* LDZ  */ t=T;            SET(1, 0) PUT(0, ram[t]) break;
90 
-			case 0x30:            t=T;            SET(1, 1) PUT2(0, PEEK2(ram + t)) break;
91 
-			case 0x11: /* STZ  */ t=T;n=N;        SET(2,-2) ram[t] = n; break;
92 
-			case 0x31:            t=T;n=H2;       SET(3,-3) POKE2(ram + t, n) break;
93 
-			case 0x12: /* LDR  */ t=T;            SET(1, 0) PUT(0, ram[pc + (Sint8)t]) break;
94 
-			case 0x32:            t=T;            SET(1, 1) PUT2(0, PEEK2(ram + pc + (Sint8)t)) break;
95 
-			case 0x13: /* STR  */ t=T;n=N;        SET(2,-2) ram[pc + (Sint8)t] = n; break;
96 
-			case 0x33:            t=T;n=H2;       SET(3,-3) POKE2(ram + pc + (Sint8)t, n) break;
97 
-			case 0x14: /* LDA  */ t=T2;           SET(2,-1) PUT(0, ram[t]) break;
98 
-			case 0x34:            t=T2;           SET(2, 0) PUT2(0, PEEK2(ram + t)) break;
99 
-			case 0x15: /* STA  */ t=T2;n=L;       SET(3,-3) ram[t] = n; break;
100 
-			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;
103 
-			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;
105 
-			case 0x18: /* ADD  */ t=T;n=N;        SET(2,-1) PUT(0, n + t) break;
106 
-			case 0x38:            t=T2;n=N2;      SET(4,-2) PUT2(0, n + t) break;
107 
-			case 0x19: /* SUB  */ t=T;n=N;        SET(2,-1) PUT(0, n - t) break;
108 
-			case 0x39:            t=T2;n=N2;      SET(4,-2) PUT2(0, n - t) break;
109 
-			case 0x1a: /* MUL  */ t=T;n=N;        SET(2,-1) PUT(0, n * t) break;
110 
-			case 0x3a:            t=T2;n=N2;      SET(4,-2) PUT2(0, n * t) break;
111 
-			case 0x1b: /* DIV  */ t=T;n=N;        SET(2,-1) if(!t) HALT(3) PUT(0, n / t) break;
112 
-			case 0x3b:            t=T2;n=N2;      SET(4,-2) if(!t) HALT(3) PUT2(0, n / t) break;
113 
-			case 0x1c: /* AND  */ t=T;n=N;        SET(2,-1) PUT(0, n & t) break;
114 
-			case 0x3c:            t=T2;n=N2;      SET(4,-2) PUT2(0, n & t) break;
115 
-			case 0x1d: /* ORA  */ t=T;n=N;        SET(2,-1) PUT(0, n | t) break;
116 
-			case 0x3d:            t=T2;n=N2;      SET(4,-2) PUT2(0, n | t) break;
117 
-			case 0x1e: /* EOR  */ t=T;n=N;        SET(2,-1) PUT(0, n ^ t) break;
118 
-			case 0x3e:            t=T2;n=N2;      SET(4,-2) PUT2(0, n ^ t) break;
119 
-			case 0x1f: /* SFT  */ t=T;n=N;        SET(2,-1) PUT(0, n >> (t & 0xf) << (t >> 4)) break;
120 
-			case 0x3f:            t=T;n=H2;       SET(3,-1) PUT2(0, n >> (t & 0xf) << (t >> 4)) break;
43 
+		if(ins & 0x80) { ksp = s->ptr; sp = &ksp; } else sp = &s->ptr;
44 
+		/* Opcodes */
45 
+		switch(opc - (!opc * (ins >> 5))) {
46 
+		/* Immediate */
47 
+		case -0x0: /* BRK   */ return 1;
48 
+		case -0x1: /* JCI   */ POP8(b) if(!b) { pc += 2; break; } /* else fallthrough */
49 
+		case -0x2: /* JMI   */ pc += PEEK2(ram + pc) + 2; break;
50 
+		case -0x3: /* JSI   */ PUSH16(pc + 2) pc += PEEK2(ram + pc) + 2; break;
51 
+		case -0x4: /* LIT   */
52 
+		case -0x6: /* LITr  */ a = ram[pc++]; PUSH8(a) break;
53 
+		case -0x5: /* LIT2  */
54 
+		case -0x7: /* LIT2r */ PUSH16(PEEK2(ram + pc)) pc += 2; break;
55 
+		/* ALU */
56 
+		case 0x01: /* INC */ POP(a) PUSH(a + 1) break;
57 
+		case 0x02: /* POP */ POP(a) break;
58 
+		case 0x03: /* NIP */ POP(a) POP(b) PUSH(a) break;
59 
+		case 0x04: /* SWP */ POP(a) POP(b) PUSH(a) PUSH(b) break;
60 
+		case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(b) PUSH(a) PUSH(c) break;
61 
+		case 0x06: /* DUP */ POP(a) PUSH(a) PUSH(a) break;
62 
+		case 0x07: /* OVR */ POP(a) POP(b) PUSH(b) PUSH(a) PUSH(b) break;
63 
+		case 0x08: /* EQU */ POP(a) POP(b) PUSH8(b == a) break;
64 
+		case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(b != a) break;
65 
+		case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(b > a) break;
66 
+		case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(b < a) break;
67 
+		case 0x0c: /* JMP */ POP(a) JUMP(a) break;
68 
+		case 0x0d: /* JCN */ POP(a) POP8(b) if(b) JUMP(a) break;
69 
+		case 0x0e: /* JSR */ POP(a) FLIP() PUSH16(pc) JUMP(a) break;
70 
+		case 0x0f: /* STH */ POP(a) FLIP() PUSH(a) break;
71 
+		case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(b) break;
72 
+		case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break;
73 
+		case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(b) break;
74 
+		case 0x13: /* STR */ POP8(a) POP(b) POKE(pc + (Sint8)a, b) break;
75 
+		case 0x14: /* LDA */ POP16(a) PEEK(b, a) PUSH(b) break;
76 
+		case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) break;
77 
+		case 0x16: /* DEI */ POP8(a) DEVR(b, a) PUSH(b) break;
78 
+		case 0x17: /* DEO */ POP8(a) POP(b) DEVW(a, b) break;
79 
+		case 0x18: /* ADD */ POP(a) POP(b) PUSH(b + a) break;
80 
+		case 0x19: /* SUB */ POP(a) POP(b) PUSH(b - a) break;
81 
+		case 0x1a: /* MUL */ POP(a) POP(b) PUSH((Uint32)b * a) break;
82 
+		case 0x1b: /* DIV */ POP(a) POP(b) if(!a) HALT(3) PUSH(b / a) break;
83 
+		case 0x1c: /* AND */ POP(a) POP(b) PUSH(b & a) break;
84 
+		case 0x1d: /* ORA */ POP(a) POP(b) PUSH(b | a) break;
85 
+		case 0x1e: /* EOR */ POP(a) POP(b) PUSH(b ^ a) break;
86 
+		case 0x1f: /* SFT */ POP8(a) POP(b) PUSH(b >> (a & 0xf) << (a >> 4)) break;
121 87 
 		}
122 88 
 	}
123 89 
 }