commit a1d2bfbbb088a5f79f6be4e25a4eeb115b8efd8d
parent fda12df0f11cc861082a8009cb3c5a40a16ce803
Author: neauoire <aliceffekt@gmail.com>
Date: Tue, 8 Aug 2023 09:23:11 -0700
Removed DEI/DEO from uxn-tnl core
Diffstat:
7 files changed, 134 insertions(+), 240 deletions(-)
diff --git a/etc/archives/uxn-registers.c b/etc/archives/uxn-registers.c
@@ -1,134 +0,0 @@
-#include "uxn.h"
-
-/*
-Copyright (u) 2022-2023 Devine Lu Linvega, Andrew Alderwick, Andrew Richards
-
-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.
-*/
-
-/* Registers
-[ . ][ . ][ . ][ L ][ N ][ T ] <
-[ . ][ . ][ . ][ H2 ][ T ] <
-[ L2 ][ N2 ][ T2 ] <
-*/
-
-#define T s->dat[s->ptr - 1]
-#define N s->dat[s->ptr - 2]
-#define L s->dat[s->ptr - 3]
-#define T2 PEEK2(s->dat + s->ptr - 2)
-#define H2 PEEK2(s->dat + s->ptr - 3)
-#define N2 PEEK2(s->dat + s->ptr - 4)
-#define L2 PEEK2(s->dat + s->ptr - 6)
-
-#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; }
-#define PUT(o, v) { s->dat[(s->ptr - 1 - (o))] = (v); }
-#define PUT2(o, v) { tmp = (v); POKE2(s->dat + (s->ptr - o - 2), tmp); }
-#define DEO(a, b) { u->dev[(a)] = (b); if((deo_mask[(a) >> 4] >> ((a) & 0xf)) & 0x1) emu_deo(u, (a)); }
-#define DEI(a, b) { PUT((a), ((dei_mask[(b) >> 4] >> ((b) & 0xf)) & 0x1) ? emu_dei(u, (b)) : u->dev[(b)]) }
-
-int
-uxn_eval(Uxn *u, Uint16 pc)
-{
- int t, n, l, k, tmp, ins, opc;
- Uint8 *ram = u->ram;
- Stack *s;
- if(!pc || u->dev[0x0f]) return 0;
- for(;;) {
- ins = ram[pc++];
- k = ins & 0x80 ? 0xff : 0;
- s = ins & 0x40 ? &u->rst : &u->wst;
- opc = !(ins & 0x1f) ? (0 - (ins >> 5)) & 0xff : ins & 0x3f;
- switch(opc) {
- /* 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;
- /* 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 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 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break;
- case 0x2c: 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 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 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 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) DEI(0, t) break;
- case 0x36: t=T; SET(1, 1) DEI(1, t) DEI(0, t + 1) 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;
- }
- }
-}
-
-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/archives/uxn.c b/etc/archives/uxn.c
@@ -1,104 +0,0 @@
-#include <stdio.h>
-#include "uxn.h"
-
-/*
-Copyright (u) 2022-2023 Devine Lu Linvega, Andrew Alderwick, Andrew Richards
-
-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.
-*/
-
-#define HALT(c) { return emu_halt(u, instr, (c), pc - 1); }
-#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
-#define PUSH8(x) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (x); }
-#define PUSH16(x) { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (x); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; }
-#define PUSH(x) { if(m2) { PUSH16(x) } else { PUSH8(x) } }
-#define POP8(o) { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
-#define POP16(o) { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
-#define POP(o) { if(m2) { POP16(o) } else { POP8(o) } }
-#define POKE(x, y) { if(m2) { t = (y); POKE2(u->ram + x, t) } else { u->ram[(x)] = (y); } }
-#define PEEK(o, x) { if(m2) { o = PEEK2(u->ram + x); } else o = u->ram[(x)]; }
-#define DEI(port) { }
-#define DEO(port, value) { u->dev[(port)] = (value); if((deo_mask[(port) >> 4] >> ((port) & 0xf)) & 0x1) emu_deo(u, (port)); }
-#define DEVR(dest, port) { if(m2) { dest = (emu_dei(u, (port)) << 8) + emu_dei(u, (port+1)); } else { dest = emu_dei(u, (port)); } }
-#define DEVW(port, value) { if(m2) { DEO((port),(value >> 8)) DEO((port+1),(value)) } else { DEO((port),(value)) } }
-
-int
-uxn_eval(Uxn *u, Uint16 pc)
-{
- Uint8 instr, opcode, m2, ksp, tsp, *sp;
- Uint16 a, b, c, t;
- Stack *s;
- if(!pc || u->dev[0x0f]) return 0;
- for(;;) {
- instr = u->ram[pc++];
- /* printf("%02x\n", instr); */
- opcode = instr & 0x1f;
- /* Short Mode */
- m2 = instr & 0x20;
- /* Return Mode */
- s = instr & 0x40 ? &u->rst : &u->wst;
- /* Keep Mode */
- if(instr & 0x80) { ksp = s->ptr; sp = &ksp; }
- else sp = &s->ptr;
- /* Opcodes */
- switch(opcode - (!opcode * (instr >> 5))) {
- /* Immediate */
- case -0x0: /* BRK */ return 1;
- case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; } /* else fallthrough */
- case -0x2: /* JMI */ pc += PEEK2(u->ram + pc) + 2; break;
- case -0x3: /* JSI */ s = &u->rst; PUSH16(pc + 2) pc += PEEK2(u->ram + pc) + 2; break;
- case -0x4: /* LIT */
- case -0x6: /* LITr */ a = u->ram[pc++]; PUSH8(a) break;
- case -0x5: /* LIT2 */
- case -0x7: /* LIT2r */ PUSH16(PEEK2(u->ram + pc)) pc += 2; break;
- /* ALU */
- case 0x01: /* INC */ POP(a) PUSH(a + 1) break;
- case 0x02: /* POP */ POP(a) break;
- case 0x03: /* NIP */ POP(a) POP(b) PUSH(a) break;
- case 0x04: /* SWP */ POP(a) POP(b) PUSH(a) PUSH(b) break;
- case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(b) PUSH(a) PUSH(c) break;
- case 0x06: /* DUP */ POP(a) PUSH(a) PUSH(a) break;
- case 0x07: /* OVR */ POP(a) POP(b) PUSH(b) PUSH(a) PUSH(b) break;
- case 0x08: /* EQU */ POP(a) POP(b) PUSH8(b == a) break;
- case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(b != a) break;
- case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(b > a) break;
- case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(b < a) break;
- case 0x0c: /* JMP */ POP(a) JUMP(a) break;
- case 0x0d: /* JCN */ POP(a) POP8(b) if(b) JUMP(a) break;
- case 0x0e: /* JSR */ POP(a) s = (instr & 0x40) ? &u->wst : &u->rst; PUSH16(pc) JUMP(a) break;
- case 0x0f: /* STH */ POP(a) s = (instr & 0x40) ? &u->wst : &u->rst; PUSH(a) break;
- case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(b) break;
- case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break;
- case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(b) break;
- case 0x13: /* STR */ POP8(a) POP(b) POKE(pc + (Sint8)a, b) break;
- case 0x14: /* LDA */ POP16(a) PEEK(b, a) PUSH(b) break;
- case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) break;
- case 0x16: /* DEI */ POP8(a) DEVR(b, a) PUSH(b) break;
- case 0x17: /* DEO */ POP8(a) POP(b) DEVW(a, b) break;
- case 0x18: /* ADD */ POP(a) POP(b) PUSH(b + a) break;
- case 0x19: /* SUB */ POP(a) POP(b) PUSH(b - a) break;
- case 0x1a: /* MUL */ POP(a) POP(b) PUSH((Uint32)b * a) break;
- case 0x1b: /* DIV */ POP(a) POP(b) if(!a) HALT(3) PUSH(b / a) break;
- case 0x1c: /* AND */ POP(a) POP(b) PUSH(b & a) break;
- case 0x1d: /* ORA */ POP(a) POP(b) PUSH(b | a) break;
- case 0x1e: /* EOR */ POP(a) POP(b) PUSH(b ^ a) break;
- case 0x1f: /* SFT */ POP8(a) POP(b) PUSH(b >> (a & 0x0f) << ((a & 0xf0) >> 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/src/uxn.c b/etc/cores/uxn-abc.c
diff --git a/etc/cores/uxn-tnl.c b/etc/cores/uxn-tnl.c
@@ -0,0 +1,132 @@
+#include "uxn.h"
+
+/*
+Copyright (u) 2022-2023 Devine Lu Linvega, Andrew Alderwick, Andrew Richards
+
+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.
+*/
+
+/* Registers
+[ . ][ . ][ . ][ L ][ N ][ T ] <
+[ . ][ . ][ . ][ H2 ][ T ] <
+[ L2 ][ N2 ][ T2 ] <
+*/
+
+#define T s->dat[s->ptr - 1]
+#define N s->dat[s->ptr - 2]
+#define L s->dat[s->ptr - 3]
+#define T2 PEEK2(s->dat + s->ptr - 2)
+#define H2 PEEK2(s->dat + s->ptr - 3)
+#define N2 PEEK2(s->dat + s->ptr - 4)
+#define L2 PEEK2(s->dat + s->ptr - 6)
+
+#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; }
+#define PUT(o, v) { s->dat[(s->ptr - 1 - (o))] = (v); }
+#define PUT2(o, v) { tmp = (v); POKE2(s->dat + (s->ptr - o - 2), tmp); }
+
+int
+uxn_eval(Uxn *u, Uint16 pc)
+{
+ int t, n, l, k, tmp, ins, opc;
+ Uint8 *ram = u->ram;
+ Stack *s;
+ if(!pc || u->dev[0x0f]) return 0;
+ for(;;) {
+ ins = ram[pc++];
+ k = ins & 0x80 ? 0xff : 0;
+ s = ins & 0x40 ? &u->rst : &u->wst;
+ opc = !(ins & 0x1f) ? (0 - (ins >> 5)) & 0xff : ins & 0x3f;
+ switch(opc) {
+ /* 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;
+ /* 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 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 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break;
+ case 0x2c: 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 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 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 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 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;
+ }
+ }
+}
+
+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/src/uxn.h b/etc/cores/uxn.h
diff --git a/src/uxn.c b/src/uxn.c
@@ -23,7 +23,7 @@ WITH REGARD TO THIS SOFTWARE.
#define POP2(o) { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
#define POPx(o) { if(m2) { POP2(o) } else { POP1(o) } }
#define DEVW(p, y) { if(m2) { DEO(p, y >> 8) DEO((p + 1), y) } else { DEO(p, y) } }
-#define DEVR(o, p) { if(m2) { o = ((DEI(p) << 8) + DEI(p + 1)); } else { o = DEI(p); } }
+#define DEVR(o, p) { if(m2) { o = DEI(p) << 8 | DEI(p + 1); } else { o = DEI(p); } }
int
uxn_eval(Uxn *u, Uint16 pc)
diff --git a/src/uxn.h b/src/uxn.h
@@ -15,7 +15,7 @@ WITH REGARD TO THIS SOFTWARE.
#define POKE2(d, v) { (d)[0] = (v) >> 8; (d)[1] = (v); }
#define PEEK2(d) ((d)[0] << 8 | (d)[1])
-#define DEO(p, value) { u->dev[p] = value; if((deo_mask[p >> 4] >> (p & 0xf)) & 0x1) emu_deo(u, p); }
+#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 */
