commit 87a72de
Devine Lu Linvega
·
2023-04-30 18:43:33 +0000 UTC
parent cb1fe32
Using new core
4 files changed,
+254,
-68
+101,
-0
1@@ -0,0 +1,101 @@
2+#include "uxn.h"
3+#include <stdio.h>
4+
5+/*
6+Copyright (u) 2022-2023 Devine Lu Linvega, Andrew Alderwick, Andrew Richards
7+
8+Permission to use, copy, modify, and distribute this software for any
9+purpose with or without fee is hereby granted, provided that the above
10+copyright notice and this permission notice appear in all copies.
11+
12+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
13+WITH REGARD TO THIS SOFTWARE.
14+*/
15+
16+/* a,b,c: general use. m2: byte/short mode flag.
17+ tsp: macro temp stack ptr. ksp: "keep" mode copy of stack ptr. sp: ptr to stack ptr.
18+ x,y: macro in params. o: macro out param. */
19+
20+#define HALT(c) { return uxn_halt(u, instr, (c), pc - 1); }
21+#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
22+#define PUSH8(x) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (x); }
23+#define PUSH16(x) { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (x); s->dat[tsp] = t >> 8; s->dat[tsp + 1] = t; s->ptr = tsp + 2; }
24+#define PUSH(x) { if(m2) { PUSH16(x) } else { PUSH8(x) } }
25+#define POP8(o) { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
26+#define POP16(o) { if((tsp = *sp) <= 0x01) HALT(1) o = s->dat[tsp - 1] | (s->dat[tsp - 2] << 8); *sp = tsp - 2; }
27+#define POP(o) { if(m2) { POP16(o) } else { POP8(o) } }
28+#define POKE(x, y) { if(m2) { t = (y); u->ram[(x)] = t >> 8; u->ram[(x) + 1] = t; } else { u->ram[(x)] = (y); } }
29+#define PEEK16(o, x) { o = (u->ram[(x)] << 8) | u->ram[(x) + 1]; }
30+#define PEEK(o, x) { if(m2) PEEK16(o, x) else o = u->ram[(x)]; }
31+#define DEO(a, b) { u->dev[(a)] = (b); if((deo_mask[(a) >> 4] >> ((a) & 0xf)) & 0x1) uxn_deo(u, (a)); }
32+#define DEI(a, b) { a = ((dei_mask[(b) >> 4] >> ((b) & 0xf)) & 0x1) ? uxn_dei(u, (b)) : u->dev[(b)]; }
33+
34+int
35+uxn_eval(Uxn *u, Uint16 pc)
36+{
37+ Uint8 instr, opcode, m2, ksp, tsp, *sp;
38+ Uint16 a, b, c, t;
39+ Stack *s;
40+ if(!pc || u->dev[0x0f]) return 0;
41+ for(;;) {
42+ instr = u->ram[pc++];
43+ opcode = instr & 0x1f;
44+ /* 2 Mode */ m2 = instr & 0x20;
45+ /* r Mode */ s = instr & 0x40 ? &u->rst : &u->wst;
46+ /* k Mode */ if(instr & 0x80) { ksp = s->ptr; sp = &ksp; } else sp = &s->ptr;
47+ switch(opcode - (!opcode * (instr >> 5))) {
48+ /* Immediate */
49+ case -0x0: /* BRK */ return 1;
50+ case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; } /* fall through */
51+ case -0x2: /* JMI */ PEEK16(a, pc) pc += a + 2; break;
52+ case -0x3: /* JSI */ s = &u->rst; PUSH16(pc + 2) PEEK16(a, pc) pc += a + 2; break;
53+ case -0x4: /* LIT */
54+ case -0x6: /* LITr */ a = u->ram[pc++]; PUSH8(a) break;
55+ case -0x5: /* LIT2 */
56+ case -0x7: /* LIT2r */ PEEK16(a, pc) PUSH16(a) pc += 2; break;
57+ /* ALU */
58+ case 0x01: /* INC */ POP(a) PUSH(a + 1) break;
59+ case 0x02: /* POP */ POP(a) break;
60+ case 0x03: /* NIP */ POP(a) POP(b) PUSH(a) break;
61+ case 0x04: /* SWP */ POP(a) POP(b) PUSH(a) PUSH(b) break;
62+ case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(b) PUSH(a) PUSH(c) break;
63+ case 0x06: /* DUP */ POP(a) PUSH(a) PUSH(a) break;
64+ case 0x07: /* OVR */ POP(a) POP(b) PUSH(b) PUSH(a) PUSH(b) break;
65+ case 0x08: /* EQU */ POP(a) POP(b) PUSH8(b == a) break;
66+ case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(b != a) break;
67+ case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(b > a) break;
68+ case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(b < a) break;
69+ case 0x0c: /* JMP */ POP(a) JUMP(a) break;
70+ case 0x0d: /* JCN */ POP(a) POP8(b) if(b) JUMP(a) break;
71+ case 0x0e: /* JSR */ POP(a) s = (instr & 0x40) ? &u->wst : &u->rst; PUSH16(pc) JUMP(a) break;
72+ case 0x0f: /* STH */ POP(a) s = (instr & 0x40) ? &u->wst : &u->rst; PUSH(a) break;
73+ case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(b) break;
74+ case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break;
75+ case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(b) break;
76+ case 0x13: /* STR */ POP8(a) POP(b) POKE(pc + (Sint8)a, b) break;
77+ case 0x14: /* LDA */ POP16(a) PEEK(b, a) PUSH(b) break;
78+ case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) break;
79+ case 0x16: /* DEI */ POP8(a) if(m2){ DEI(b, a) DEI(c, a + 1) PUSH16((b << 8) | c) } else { DEI(b, a) PUSH8(b) } break;
80+ case 0x17: /* DEO */ POP8(a) if(m2){ POP(b) DEO(a, b >> 8) DEO(a + 1, b) } else { POP8(b) DEO(a, b) } break;
81+ case 0x18: /* ADD */ POP(a) POP(b) PUSH(b + a) break;
82+ case 0x19: /* SUB */ POP(a) POP(b) PUSH(b - a) break;
83+ case 0x1a: /* MUL */ POP(a) POP(b) PUSH((Uint32)b * a) break;
84+ case 0x1b: /* DIV */ POP(a) POP(b) if(!a) HALT(3) PUSH(b / a) break;
85+ case 0x1c: /* AND */ POP(a) POP(b) PUSH(b & a) break;
86+ case 0x1d: /* ORA */ POP(a) POP(b) PUSH(b | a) break;
87+ case 0x1e: /* EOR */ POP(a) POP(b) PUSH(b ^ a) break;
88+ case 0x1f: /* SFT */ POP8(a) POP(b) PUSH(b >> (a & 0x0f) << ((a & 0xf0) >> 4)) break;
89+ }
90+ }
91+}
92+
93+int
94+uxn_boot(Uxn *u, Uint8 *ram)
95+{
96+ Uint32 i;
97+ char *cptr = (char *)u;
98+ for(i = 0; i < sizeof(*u); i++)
99+ cptr[i] = 0;
100+ u->ram = ram;
101+ return 1;
102+}
+49,
-0
1@@ -0,0 +1,49 @@
2+/*
3+Copyright (c) 2021 Devine Lu Linvega
4+
5+Permission to use, copy, modify, and distribute this software for any
6+purpose with or without fee is hereby granted, provided that the above
7+copyright notice and this permission notice appear in all copies.
8+
9+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10+WITH REGARD TO THIS SOFTWARE.
11+*/
12+
13+#define PAGE_PROGRAM 0x0100
14+
15+/* clang-format off */
16+
17+#define POKE2(d, v) { (d)[0] = (v) >> 8; (d)[1] = (v); }
18+#define PEEK2(d) ((d)[0] << 8 | (d)[1])
19+
20+/* clang-format on */
21+
22+typedef unsigned char Uint8;
23+typedef signed char Sint8;
24+typedef unsigned short Uint16;
25+typedef signed short Sint16;
26+typedef unsigned int Uint32;
27+
28+typedef struct {
29+ Uint8 dat[255], ptr;
30+} Stack;
31+
32+typedef struct Uxn {
33+ Uint8 *ram, dev[256];
34+ Stack wst, rst;
35+ Uint8 (*dei)(struct Uxn *u, Uint8 addr);
36+ void (*deo)(struct Uxn *u, Uint8 addr);
37+} Uxn;
38+
39+/* required functions */
40+
41+extern Uint8 uxn_dei(Uxn *u, Uint8 addr);
42+extern void uxn_deo(Uxn *u, Uint8 addr);
43+extern int uxn_halt(Uxn *u, Uint8 instr, Uint8 err, Uint16 addr);
44+extern Uint16 dei_mask[];
45+extern Uint16 deo_mask[];
46+
47+/* built-ins */
48+
49+int uxn_boot(Uxn *u, Uint8 *ram);
50+int uxn_eval(Uxn *u, Uint16 pc);
+103,
-67
1@@ -1,5 +1,4 @@
2 #include "uxn.h"
3-#include <stdio.h>
4
5 /*
6 Copyright (u) 2022-2023 Devine Lu Linvega, Andrew Alderwick, Andrew Richards
7@@ -12,79 +11,116 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
8 WITH REGARD TO THIS SOFTWARE.
9 */
10
11-/* a,b,c: general use. m2: byte/short mode flag.
12- tsp: macro temp stack ptr. ksp: "keep" mode copy of stack ptr. sp: ptr to stack ptr.
13- x,y: macro in params. o: macro out param. */
14+#define T s->dat[s->ptr - 1]
15+#define N s->dat[s->ptr - 2]
16+#define L s->dat[s->ptr - 3]
17+#define H2 PEEK2(s->dat + s->ptr - 3)
18+#define T2 PEEK2(s->dat + s->ptr - 2)
19+#define N2 PEEK2(s->dat + s->ptr - 4)
20+#define L2 PEEK2(s->dat + s->ptr - 6)
21
22-#define HALT(c) { return uxn_halt(u, instr, (c), pc - 1); }
23-#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
24-#define PUSH8(x) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (x); }
25-#define PUSH16(x) { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (x); s->dat[tsp] = t >> 8; s->dat[tsp + 1] = t; s->ptr = tsp + 2; }
26-#define PUSH(x) { if(m2) { PUSH16(x) } else { PUSH8(x) } }
27-#define POP8(o) { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
28-#define POP16(o) { if((tsp = *sp) <= 0x01) HALT(1) o = s->dat[tsp - 1] | (s->dat[tsp - 2] << 8); *sp = tsp - 2; }
29-#define POP(o) { if(m2) { POP16(o) } else { POP8(o) } }
30-#define POKE(x, y) { if(m2) { t = (y); u->ram[(x)] = t >> 8; u->ram[(x) + 1] = t; } else { u->ram[(x)] = (y); } }
31-#define PEEK16(o, x) { o = (u->ram[(x)] << 8) | u->ram[(x) + 1]; }
32-#define PEEK(o, x) { if(m2) PEEK16(o, x) else o = u->ram[(x)]; }
33+/* Registers
34+
35+[ . ][ . ][ . ][ L ][ N ][ T ] <
36+[ . ][ . ][ . ][ H2 ][ T ] <
37+[ L2 ][ N2 ][ T2 ] <
38+
39+*/
40+
41+#define HALT(c) { return uxn_halt(u, ins, (c), pc - 1); }
42+#define SET(mul, add) { if(mul > s->ptr) HALT(1) tmp = s->ptr + k * mul + add; if(tmp > 254) HALT(2) s->ptr = tmp; }
43+#define PUT(o, v) { s->dat[(Uint8)(s->ptr - 1 - (o))] = (v); }
44+#define PUT2(o, v) { tmp = (v); s->dat[(Uint8)(s->ptr - o - 2)] = tmp >> 8; s->dat[(Uint8)(s->ptr - o - 1)] = tmp; }
45+#define PUSH(x, v) { z = (x); if(z->ptr > 254) HALT(2) z->dat[z->ptr++] = (v); }
46+#define PUSH2(x, v) { z = (x); if(z->ptr > 253) HALT(2) tmp = (v); z->dat[z->ptr] = tmp >> 8; z->dat[z->ptr + 1] = tmp; z->ptr += 2; }
47 #define DEO(a, b) { u->dev[(a)] = (b); if((deo_mask[(a) >> 4] >> ((a) & 0xf)) & 0x1) uxn_deo(u, (a)); }
48-#define DEI(a, b) { a = ((dei_mask[(b) >> 4] >> ((b) & 0xf)) & 0x1) ? uxn_dei(u, (b)) : u->dev[(b)]; }
49+#define DEI(a, b) { PUT((a), ((dei_mask[(b) >> 4] >> ((b) & 0xf)) & 0x1) ? uxn_dei(u, (b)) : u->dev[(b)]) }
50
51 int
52 uxn_eval(Uxn *u, Uint16 pc)
53 {
54- Uint8 instr, opcode, m2, ksp, tsp, *sp;
55- Uint16 a, b, c, t;
56- Stack *s;
57+ int t, n, l, k, tmp, opc, ins;
58+ Uint8 *ram = u->ram;
59+ Stack *s, *z;
60 if(!pc || u->dev[0x0f]) return 0;
61 for(;;) {
62- instr = u->ram[pc++];
63- opcode = instr & 0x1f;
64- /* 2 Mode */ m2 = instr & 0x20;
65- /* r Mode */ s = instr & 0x40 ? &u->rst : &u->wst;
66- /* k Mode */ if(instr & 0x80) { ksp = s->ptr; sp = &ksp; } else sp = &s->ptr;
67- switch(opcode - (!opcode * (instr >> 5))) {
68- /* Immediate */
69- case -0x0: /* BRK */ return 1;
70- case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; } /* fall through */
71- case -0x2: /* JMI */ PEEK16(a, pc) pc += a + 2; break;
72- case -0x3: /* JSI */ s = &u->rst; PUSH16(pc + 2) PEEK16(a, pc) pc += a + 2; break;
73- case -0x4: /* LIT */
74- case -0x6: /* LITr */ a = u->ram[pc++]; PUSH8(a) break;
75- case -0x5: /* LIT2 */
76- case -0x7: /* LIT2r */ PEEK16(a, pc) PUSH16(a) pc += 2; break;
77- /* ALU */
78- case 0x01: /* INC */ POP(a) PUSH(a + 1) break;
79- case 0x02: /* POP */ POP(a) break;
80- case 0x03: /* NIP */ POP(a) POP(b) PUSH(a) break;
81- case 0x04: /* SWP */ POP(a) POP(b) PUSH(a) PUSH(b) break;
82- case 0x05: /* ROT */ POP(a) POP(b) POP(c) PUSH(b) PUSH(a) PUSH(c) break;
83- case 0x06: /* DUP */ POP(a) PUSH(a) PUSH(a) break;
84- case 0x07: /* OVR */ POP(a) POP(b) PUSH(b) PUSH(a) PUSH(b) break;
85- case 0x08: /* EQU */ POP(a) POP(b) PUSH8(b == a) break;
86- case 0x09: /* NEQ */ POP(a) POP(b) PUSH8(b != a) break;
87- case 0x0a: /* GTH */ POP(a) POP(b) PUSH8(b > a) break;
88- case 0x0b: /* LTH */ POP(a) POP(b) PUSH8(b < a) break;
89- case 0x0c: /* JMP */ POP(a) JUMP(a) break;
90- case 0x0d: /* JCN */ POP(a) POP8(b) if(b) JUMP(a) break;
91- case 0x0e: /* JSR */ POP(a) s = (instr & 0x40) ? &u->wst : &u->rst; PUSH16(pc) JUMP(a) break;
92- case 0x0f: /* STH */ POP(a) s = (instr & 0x40) ? &u->wst : &u->rst; PUSH(a) break;
93- case 0x10: /* LDZ */ POP8(a) PEEK(b, a) PUSH(b) break;
94- case 0x11: /* STZ */ POP8(a) POP(b) POKE(a, b) break;
95- case 0x12: /* LDR */ POP8(a) PEEK(b, pc + (Sint8)a) PUSH(b) break;
96- case 0x13: /* STR */ POP8(a) POP(b) POKE(pc + (Sint8)a, b) break;
97- case 0x14: /* LDA */ POP16(a) PEEK(b, a) PUSH(b) break;
98- case 0x15: /* STA */ POP16(a) POP(b) POKE(a, b) break;
99- case 0x16: /* DEI */ POP8(a) if(m2){ DEI(b, a) DEI(c, a + 1) PUSH16((b << 8) | c) } else { DEI(b, a) PUSH8(b) } break;
100- case 0x17: /* DEO */ POP8(a) if(m2){ POP(b) DEO(a, b >> 8) DEO(a + 1, b) } else { POP8(b) DEO(a, b) } break;
101- case 0x18: /* ADD */ POP(a) POP(b) PUSH(b + a) break;
102- case 0x19: /* SUB */ POP(a) POP(b) PUSH(b - a) break;
103- case 0x1a: /* MUL */ POP(a) POP(b) PUSH((Uint32)b * a) break;
104- case 0x1b: /* DIV */ POP(a) POP(b) if(!a) HALT(3) PUSH(b / a) break;
105- case 0x1c: /* AND */ POP(a) POP(b) PUSH(b & a) break;
106- case 0x1d: /* ORA */ POP(a) POP(b) PUSH(b | a) break;
107- case 0x1e: /* EOR */ POP(a) POP(b) PUSH(b ^ a) break;
108- case 0x1f: /* SFT */ POP8(a) POP(b) PUSH(b >> (a & 0x0f) << ((a & 0xf0) >> 4)) break;
109+ ins = ram[pc++] & 0xff;
110+ k = !!(ins & 0x80);
111+ s = ins & 0x40 ? &u->rst : &u->wst;
112+ opc = !(ins & 0x1f) ? (0 - (ins >> 5)) & 0xff : ins & 0x3f;
113+ switch(opc) {
114+ /* IMM */
115+ case 0x00: /* BRK */ return 1;
116+ case 0xff: /* JCI */ pc += !!s->dat[--s->ptr] * PEEK2(ram + pc) + 2; break;
117+ case 0xfe: /* JMI */ pc += PEEK2(ram + pc) + 2; break;
118+ case 0xfd: /* JSI */ PUSH2(&u->rst, pc + 2) pc += PEEK2(ram + pc) + 2; break;
119+ case 0xfc: /* LIT */ PUSH(s, ram[pc++]) break;
120+ case 0xfb: /* LIT2 */ PUSH2(s, PEEK2(ram + pc)) pc += 2; break;
121+ case 0xfa: /* LITr */ PUSH(s, ram[pc++]) break;
122+ case 0xf9: /* LIT2r */ PUSH2(s, PEEK2(ram + pc)) pc += 2; break;
123+ /* ALU */
124+ case 0x01: /* INC */ t=T; SET(1, 0) PUT(0, t + 1) break;
125+ case 0x21: t=T2; SET(2, 0) PUT2(0, t + 1) break;
126+ case 0x02: /* POP */ SET(1,-1) break;
127+ case 0x22: SET(2,-2) break;
128+ case 0x03: /* NIP */ t=T; SET(2,-1) PUT(0, t) break;
129+ case 0x23: t=T2; SET(4,-2) PUT2(0, t) break;
130+ case 0x04: /* SWP */ t=T;n=N; SET(2, 0) PUT(0, n) PUT(1, t) break;
131+ case 0x24: t=T2;n=N2; SET(4, 0) PUT2(0, n) PUT2(2, t) break;
132+ case 0x05: /* ROT */ t=T;n=N;l=L; SET(3, 0) PUT(0, l) PUT(1, t) PUT(2, n) break;
133+ case 0x25: t=T2;n=N2;l=L2; SET(6, 0) PUT2(0, l) PUT2(2, t) PUT2(4, n) break;
134+ case 0x06: /* DUP */ t=T; SET(1, 1) PUT(0, t) PUT(1, t) break;
135+ case 0x26: t=T2; SET(2, 2) PUT2(0, t) PUT2(2, t) break;
136+ case 0x07: /* OVR */ t=T;n=N; SET(2, 1) PUT(0, n) PUT(1, t) PUT(2, n) break;
137+ case 0x27: t=T2;n=N2; SET(4, 2) PUT2(0, n) PUT2(2, t) PUT2(4, n) break;
138+ case 0x08: /* EQU */ t=T;n=N; SET(2,-1) PUT(0, n == t) break;
139+ case 0x28: t=T2;n=N2; SET(4,-3) PUT(0, n == t) break;
140+ case 0x09: /* NEQ */ t=T;n=N; SET(2,-1) PUT(0, n != t) break;
141+ case 0x29: t=T2;n=N2; SET(4,-3) PUT(0, n != t) break;
142+ case 0x0a: /* GTH */ t=T;n=N; SET(2,-1) PUT(0, n > t) break;
143+ case 0x2a: t=T2;n=N2; SET(4,-3) PUT(0, n > t) break;
144+ case 0x0b: /* LTH */ t=T;n=N; SET(2,-1) PUT(0, n < t) break;
145+ case 0x2b: t=T2;n=N2; SET(4,-3) PUT(0, n < t) break;
146+ case 0x0c: /* JMP */ t=T; SET(1,-1) pc += (Sint8)t; break;
147+ case 0x2c: t=T2; SET(2,-2) pc = t; break;
148+ case 0x0d: /* JCN */ t=T;n=N; SET(2,-2) pc += !!n * (Sint8)t; break;
149+ case 0x2d: t=T2;n=L; SET(3,-3) if(n) pc = t; break;
150+ case 0x0e: /* JSR */ t=T; SET(1,-1) PUSH2(&u->rst, pc) pc += (Sint8)t; break;
151+ case 0x2e: t=T2; SET(2,-2) PUSH2(&u->rst, pc) pc = t; break;
152+ case 0x0f: /* STH */ t=T; SET(1,-1) PUSH((ins & 0x40 ? &u->wst : &u->rst), t) break;
153+ case 0x2f: t=T2; SET(2,-2) PUSH2((ins & 0x40 ? &u->wst : &u->rst), t) break;
154+ case 0x10: /* LDZ */ t=T; SET(1, 0) PUT(0, ram[t]) break;
155+ case 0x30: t=T; SET(1, 1) PUT2(0, PEEK2(ram + t)) break;
156+ case 0x11: /* STZ */ t=T;n=N; SET(2,-2) ram[t] = n; break;
157+ case 0x31: t=T;n=H2; SET(3,-3) POKE2(ram + t, n) break;
158+ case 0x12: /* LDR */ t=T; SET(1, 0) PUT(0, ram[pc + (Sint8)t]) break;
159+ case 0x32: t=T; SET(1, 1) PUT2(0, PEEK2(ram + pc + (Sint8)t)) break;
160+ case 0x13: /* STR */ t=T;n=N; SET(2,-2) ram[pc + (Sint8)t] = n; break;
161+ case 0x33: t=T;n=H2; SET(3,-3) POKE2(ram + pc + (Sint8)t, n) break;
162+ case 0x14: /* LDA */ t=T2; SET(2,-1) PUT(0, ram[t]) break;
163+ case 0x34: t=T2; SET(2, 0) PUT2(0, PEEK2(ram + t)) break;
164+ case 0x15: /* STA */ t=T2;n=L; SET(3,-3) ram[t] = n; break;
165+ case 0x35: t=T2;n=N2; SET(4,-4) POKE2(ram + t, n) break;
166+ case 0x16: /* DEI */ t=T; SET(1, 0) DEI(0, t) break;
167+ case 0x36: t=T; SET(1, 1) DEI(1, t) DEI(0, t + 1) break;
168+ case 0x17: /* DEO */ t=T;n=N; SET(2,-2) DEO(t, n) break;
169+ case 0x37: t=T;n=N;l=L; SET(3,-3) DEO(t, l) DEO(t + 1, n) break;
170+ case 0x18: /* ADD */ t=T;n=N; SET(2,-1) PUT(0, n + t) break;
171+ case 0x38: t=T2;n=N2; SET(4,-2) PUT2(0, n + t) break;
172+ case 0x19: /* SUB */ t=T;n=N; SET(2,-1) PUT(0, n - t) break;
173+ case 0x39: t=T2;n=N2; SET(4,-2) PUT2(0, n - t) break;
174+ case 0x1a: /* MUL */ t=T;n=N; SET(2,-1) PUT(0, n * t) break;
175+ case 0x3a: t=T2;n=N2; SET(4,-2) PUT2(0, n * t) break;
176+ case 0x1b: /* DIV */ t=T;n=N; SET(2,-1) if(!t) HALT(3) PUT(0, n / t) break;
177+ case 0x3b: t=T2;n=N2; SET(4,-2) if(!t) HALT(3) PUT2(0, n / t) break;
178+ case 0x1c: /* AND */ t=T;n=N; SET(2,-1) PUT(0, n & t) break;
179+ case 0x3c: t=T2;n=N2; SET(4,-2) PUT2(0, n & t) break;
180+ case 0x1d: /* ORA */ t=T;n=N; SET(2,-1) PUT(0, n | t) break;
181+ case 0x3d: t=T2;n=N2; SET(4,-2) PUT2(0, n | t) break;
182+ case 0x1e: /* EOR */ t=T;n=N; SET(2,-1) PUT(0, n ^ t) break;
183+ case 0x3e: t=T2;n=N2; SET(4,-2) PUT2(0, n ^ t) break;
184+ case 0x1f: /* SFT */ t=T;n=N; SET(2,-1) PUT(0, n >> (t & 0xf) << (t >> 4)) break;
185+ case 0x3f: t=T;n=H2; SET(3,-1) PUT2(0, n >> (t & 0xf) << (t >> 4)) break;
186 }
187 }
188 }
189@@ -98,4 +134,4 @@ uxn_boot(Uxn *u, Uint8 *ram)
190 cptr[i] = 0;
191 u->ram = ram;
192 return 1;
193-}
194+}
+1,
-1
1@@ -46,4 +46,4 @@ extern Uint16 deo_mask[];
2 /* built-ins */
3
4 int uxn_boot(Uxn *u, Uint8 *ram);
5-int uxn_eval(Uxn *u, Uint16 pc);
6+int uxn_eval(Uxn *u, Uint16 pc);