Dariaceli's Git
Browse code

(uxn.c) Reconnected old abc core

neauoire authored on 30/10/2023 21:14:02
Showing 6 changed files
etc/cores/uxn-abc-join.c
History View file @ b35bded
1 1 
deleted file mode 100644
... ... 
@@ -1,107 +0,0 @@
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 DEVW(p, y)   { if(m2) { DEO(p, y >> 8) DEO((p + 1), y) } else { DEO(p, y) } }
20 
-#define DEVR(o, p)   { if(m2) { o = DEI(p) << 8 | DEI(p + 1); } else { o = DEI(p); } }
21 
-
22 
-#define PUSH1(y)     { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (y); }
23 
-#define PUSH2(y)     { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (y); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; }
24 
-#define PUSHx(y)     { if(m2) { PUSH2(y) } else { PUSH1(y) } }
25 
-#define PUSH11(y, z) { if(s->ptr >= 0xfe) HALT(2) s->dat[s->ptr++] = (y); s->dat[s->ptr++] = (z); }
26 
-#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; }
27 
-#define PUSHxx(y, z) { if(m2) { PUSH22(y, z) } else { PUSH11(y, z) } }
28 
-
29 
-#define POP1(o)      { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
30 
-#define POP2(o)      { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
31 
-#define POPx(o)      { if(m2) { POP2(o) } else { POP1(o) } }
32 
-#define POP11(o, p)  { if(*sp <= 0x01) HALT(1) o = s->dat[--*sp]; p = s->dat[--*sp]; }
33 
-#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; }
34 
-#define POPxx(o, p)  { if(m2) { POP22(o, p) } else { POP11(o, p) } }
35 
-
36 
-int
37 
-uxn_eval(Uxn *u, Uint16 pc)
38 
-{
39 
-	Uint8 ins, opc, m2, ksp, tsp, *sp, *ram = u->ram;
40 
-	Uint16 a, b, c, t;
41 
-	Stack *s;
42 
-	if(!pc || u->dev[0x0f]) return 0;
43 
-	for(;;) {
44 
-		ins = ram[pc++];
45 
-		/* modes */
46 
-		opc = ins & 0x1f;
47 
-		m2 = ins & 0x20;
48 
-		s = ins & 0x40 ? &u->rst : &u->wst;
49 
-		if(ins & 0x80) { ksp = s->ptr; sp = &ksp; } else sp = &s->ptr;
50 
-		/* Opcodes */
51 
-		switch(opc - (!opc * (ins >> 5))) {
52 
-		/* Immediate */
53 
-		case -0x0: /* BRK   */ return 1;
54 
-		case -0x1: /* JCI   */ POP1(b) if(!b) { pc += 2; break; } /* else fallthrough */
55 
-		case -0x2: /* JMI   */ pc += PEEK2(ram + pc) + 2; break;
56 
-		case -0x3: /* JSI   */ PUSH2(pc + 2) pc += PEEK2(ram + pc) + 2; break;
57 
-		case -0x4: /* LIT   */
58 
-		case -0x6: /* LITr  */ PUSH1(ram[pc++]) break;
59 
-		case -0x5: /* LIT2  */
60 
-		case -0x7: /* LIT2r */ PUSH2(PEEK2(ram + pc)) pc += 2; break;
61 
-		/* ALU */
62 
-		case 0x01: /* INC */ POPx(a) PUSHx(a + 1) break;
63 
-		case 0x02: /* POP */ POPx(a) break;
64 
-		case 0x03: /* NIP */ POPxx(a, b) PUSHx(a) break;
65 
-		case 0x04: /* SWP */ POPxx(a, b) PUSHxx(a, b) break;
66 
-		case 0x05: /* ROT */ POPxx(a, b) POPx(c) PUSHxx(b, a) PUSHx(c) break;
67 
-		case 0x06: /* DUP */ POPx(a) PUSHxx(a, a) break;
68 
-		case 0x07: /* OVR */ POPxx(a, b) PUSHxx(b, a) PUSHx(b) break;
69 
-		case 0x08: /* EQU */ POPxx(a, b) PUSH1(b == a) break;
70 
-		case 0x09: /* NEQ */ POPxx(a, b) PUSH1(b != a) break;
71 
-		case 0x0a: /* GTH */ POPxx(a, b) PUSH1(b > a) break;
72 
-		case 0x0b: /* LTH */ POPxx(a, b) PUSH1(b < a) break;
73 
-		case 0x0c: /* JMP */ POPx(a) JUMP(a) break;
74 
-		case 0x0d: /* JCN */ POPx(a) POP1(b) if(b) JUMP(a) break;
75 
-		case 0x0e: /* JSR */ POPx(a) FLIP PUSH2(pc) JUMP(a) break;
76 
-		case 0x0f: /* STH */ POPx(a) FLIP PUSHx(a) break;
77 
-		case 0x10: /* LDZ */ POP1(a) PEEK(b, a) PUSHx(b) break;
78 
-		case 0x11: /* STZ */ POP1(a) POPx(b) POKE(a, b) break;
79 
-		case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a) PUSHx(b) break;
80 
-		case 0x13: /* STR */ POP1(a) POPx(b) POKE(pc + (Sint8)a, b) break;
81 
-		case 0x14: /* LDA */ POP2(a) PEEK(b, a) PUSHx(b) break;
82 
-		case 0x15: /* STA */ POP2(a) POPx(b) POKE(a, b) break;
83 
-		case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSHx(b) break;
84 
-		case 0x17: /* DEO */ POP1(a) POPx(b) DEVW(a, b) break;
85 
-		case 0x18: /* ADD */ POPxx(a, b) PUSHx(b + a) break;
86 
-		case 0x19: /* SUB */ POPxx(a, b) PUSHx(b - a) break;
87 
-		case 0x1a: /* MUL */ POPxx(a, b) PUSHx((Uint32)b * a) break;
88 
-		case 0x1b: /* DIV */ POPxx(a, b) if(!a) HALT(3) PUSHx(b / a) break;
89 
-		case 0x1c: /* AND */ POPxx(a, b) PUSHx(b & a) break;
90 
-		case 0x1d: /* ORA */ POPxx(a, b) PUSHx(b | a) break;
91 
-		case 0x1e: /* EOR */ POPxx(a, b) PUSHx(b ^ a) break;
92 
-		case 0x1f: /* SFT */ POP1(a) POPx(b) PUSHx(b >> (a & 0xf) << (a >> 4)) break;
93 
-		}
94 
-	}
95 
-}
96 
-
97 
-int
98 
-uxn_boot(Uxn *u, Uint8 *ram)
99 
-{
100 
-	Uint32 i;
101 
-	char *cptr = (char *)u;
102 
-	for(i = 0; i < sizeof(*u); i++)
103 
-		cptr[i] = 0;
104 
-	u->ram = ram;
105 
-	return 1;
106 
-
107 
-}
etc/cores/uxn-abc.c
History View file @ b35bded
... ... 
@@ -11,34 +11,34 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 11 
 WITH REGARD TO THIS SOFTWARE.
12 12 
 */
13 13
14 
-#define HALT(c)    { return emu_halt(u, ins, (c), pc - 1); }
15 14 
 #define FLIP       { s = ins & 0x40 ? &u->wst : &u->rst; }
16 15 
 #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); } }
16 
+#define POKE(x, y) { if(m2) { POKE2(ram + x, y) } else ram[(x)] = (y); }
18 17 
 #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); } }
18 
+#define DEVR(o, p) { if(m2) { o = ((emu_dei(u, p) << 8) + emu_dei(u, p + 1)); } else o = emu_dei(u, p); }
19 
+#define DEVW(p, y) { if(m2) { emu_deo(u, p, y >> 8); emu_deo(u, p + 1, y); } else emu_deo(u, p, y); }
20 
+#define PUSH1(y)   { s->dat[s->ptr++] = (y); }
21 
+#define PUSH2(y)   { t = (y); s->dat[s->ptr++] = t >> 0x8; s->dat[s->ptr++] = t & 0xff; }
22 
+#define PUSHx(y)   { if(m2) { PUSH2(y) } else PUSH1(y) }
23 
+#define POP1(o)    { o = s->dat[--*sp]; }
24 
+#define POP2(o)    { o = s->dat[--*sp] | s->dat[--*sp] << 0x8; }
25 
+#define POPx(o)    { if(m2) { POP2(o) } else POP1(o) }
27 26
28 27 
 int
29 28 
 uxn_eval(Uxn *u, Uint16 pc)
30 29 
 {
31 
-	Uint8 ins, opc, m2, ksp, tsp, *sp, *ram = u->ram;
30 
+	Uint8 ksp, *sp, *ram = u->ram;
32 31 
 	Uint16 a, b, c, t;
33 
-	Stack *s;
34 32 
 	if(!pc || u->dev[0x0f]) return 0;
35 33 
 	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;
34 
+		Uint8 ins = ram[pc++], opc = ins & 0x1f;
35 
+		Uint8 m2 = ins & 0x20;
36 
+		Stack *s = ins & 0x40 ? &u->rst : &u->wst;
37 
+		if(ins & 0x80) {
38 
+			ksp = s->ptr;
39 
+			sp = &ksp;
40 
+		} else
41 
+			sp = &s->ptr;
42 42 
 		/* Opcodes */
43 43 
 		switch(opc - (!opc * (ins >> 5))) {
44 44 
 		/* Immediate */
... ... 
@@ -77,7 +77,7 @@ uxn_eval(Uxn *u, Uint16 pc)
77 77 
 		case 0x18: /* ADD */ POPx(a) POPx(b) PUSHx(b + a) break;
78 78 
 		case 0x19: /* SUB */ POPx(a) POPx(b) PUSHx(b - a) break;
79 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;
80 
+		case 0x1b: /* DIV */ POPx(a) POPx(b) PUSHx(a ? b / a : 0) break;
81 81 
 		case 0x1c: /* AND */ POPx(a) POPx(b) PUSHx(b & a) break;
82 82 
 		case 0x1d: /* ORA */ POPx(a) POPx(b) PUSHx(b | a) break;
83 83 
 		case 0x1e: /* EOR */ POPx(a) POPx(b) PUSHx(b ^ a) break;
... ... 
@@ -85,14 +85,3 @@ uxn_eval(Uxn *u, Uint16 pc)
85 85 
 		}
86 86 
 	}
87 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 
-}
src/uxn.c
History View file @ b35bded
... ... 
@@ -11,111 +11,77 @@ 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 
-[ Z ][ Y ][ X ][ L ][ N ][ T ] <
16 
-[ . ][ . ][ . ][   H2   ][ . ] <
17 
-[   L2   ][   N2   ][   T2   ] <
18 
-*/
19 
-
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) }
14 
+#define FLIP       { s = ins & 0x40 ? &u->wst : &u->rst; }
15 
+#define JUMP(x)    { if(m2) pc = (x); else pc += (Sint8)(x); }
16 
+#define POKE(x, y) { if(m2) { POKE2(ram + x, y) } else ram[(x)] = (y); }
17 
+#define PEEK(o, x) { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; }
18 
+#define DEVR(o, p) { if(m2) { o = ((emu_dei(u, p) << 8) + emu_dei(u, p + 1)); } else o = emu_dei(u, p); }
19 
+#define DEVW(p, y) { if(m2) { emu_deo(u, p, y >> 8); emu_deo(u, p + 1, y); } else emu_deo(u, p, y); }
20 
+#define PUSH1(y)   { s->dat[s->ptr++] = (y); }
21 
+#define PUSH2(y)   { t = (y); s->dat[s->ptr++] = t >> 0x8; s->dat[s->ptr++] = t & 0xff; }
22 
+#define PUSHx(y)   { if(m2) { PUSH2(y) } else PUSH1(y) }
23 
+#define POP1(o)    { o = s->dat[--*sp]; }
24 
+#define POP2(o)    { o = s->dat[--*sp] | s->dat[--*sp] << 0x8; }
25 
+#define POPx(o)    { if(m2) { POP2(o) } else POP1(o) }
38 26
39 27 
 int
40 28 
 uxn_eval(Uxn *u, Uint16 pc)
41 29 
 {
42 
-	int t, n, l, r;
43 
-	Uint8 *ram = u->ram, *rr;
30 
+	Uint8 ksp, *sp, *ram = u->ram;
31 
+	Uint16 a, b, c, t;
44 32 
 	if(!pc || u->dev[0x0f]) return 0;
45 33 
 	for(;;) {
46 
-		int ins = ram[pc++];
34 
+		Uint8 ins = ram[pc++], opc = ins & 0x1f;
35 
+		Uint8 m2 = ins & 0x20;
47 36 
 		Stack *s = ins & 0x40 ? &u->rst : &u->wst;
48 
-		switch(ins & 0x1f ? ins & 0x3f : ins << 4) {
49 
-			/* IMM */
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;
56 
-			/* ALU */
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;
59 
-			case 0x02: /* POP  */                 SET(1,-1) 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;
79 
-			case 0x0c: /* JMP  */ t=T;            SET(1,-1) pc += (Sint8)t; break;
80 
-			case 0x2c: /* JMP2 */ t=T2;           SET(2,-2) pc = t; break;
81 
-			case 0x0d: /* JCN  */ t=T;n=N;        SET(2,-2) if(n) pc += (Sint8)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;
89 
-			case 0x11: /* STZ  */ t=T;n=N;        SET(2,-2) ram[t] = n; 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;
93 
-			case 0x13: /* STR  */ t=T;n=N;        SET(2,-2) ram[pc + (Sint8)t] = n; 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;
97 
-			case 0x15: /* STA  */ t=T2;n=L;       SET(3,-3) ram[t] = n; 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;
101 
-			case 0x17: /* DEO  */ t=T;n=N;        SET(2,-2) DEO(t, n) 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;
37 
+		if(ins & 0x80) {
38 
+			ksp = s->ptr;
39 
+			sp = &ksp;
40 
+		} else
41 
+			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) PUSHx(a ? b / a : 0) 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;
119 85 
 		}
120 86 
 	}
121 87 
 }
src/uxn.h
History View file @ b35bded
... ... 
@@ -36,7 +36,7 @@ typedef struct Uxn {
36 36 
 /* required functions */
37 37
38 38 
 extern Uint8 emu_dei(Uxn *u, Uint8 addr);
39 
-extern void emu_deo(Uxn *u, Uint8 addr);
39 
+extern void emu_deo(Uxn *u, Uint8 addr, Uint8 value);
40 40 
 extern Uint8 dei_masks[0x100], deo_masks[0x100];
41 41 
 extern Uint16 dev_vers[0x10], dei_mask[0x10], deo_mask[0x10];
42 42
src/uxncli.c
History View file @ b35bded
... ... 
@@ -29,9 +29,10 @@ emu_dei(Uxn *u, Uint8 addr)
29 29 
 }
30 30
31 31 
 void
32 
-emu_deo(Uxn *u, Uint8 addr)
32 
+emu_deo(Uxn *u, Uint8 addr, Uint8 value)
33 33 
 {
34 34 
 	Uint8 p = addr & 0x0f, d = addr & 0xf0;
35 
+	u->dev[addr] = value;
35 36 
 	switch(d) {
36 37 
 	case 0x00: system_deo(u, &u->dev[d], p); break;
37 38 
 	case 0x10: console_deo(&u->dev[d], p); break;
src/uxnemu.c
History View file @ b35bded
... ... 
@@ -112,9 +112,10 @@ emu_dei(Uxn *u, Uint8 addr)
112 112 
 }
113 113
114 114 
 void
115 
-emu_deo(Uxn *u, Uint8 addr)
115 
+emu_deo(Uxn *u, Uint8 addr, Uint8 value)
116 116 
 {
117 117 
 	Uint8 p = addr & 0x0f, d = addr & 0xf0;
118 
+	u->dev[addr] = value;
118 119 
 	switch(d) {
119 120 
 	case 0x00:
120 121 
 		system_deo(u, &u->dev[d], p);