commit fcf12a12dc9b6fca27cb8c7296bb40137e1c034c
parent 6d7696a760875cf165de9e81b28d77f3868fd367
Author: neauoire <aliceffekt@gmail.com>
Date: Mon, 7 Aug 2023 16:12:12 -0700
(uxn.c) Connected to device masks
Diffstat:
| M | src/uxn.c | | | 66 | ++++++++++++++++++++++++++++++++---------------------------------- |
| M | src/uxn.h | | | 2 | ++ |
2 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/uxn.c b/src/uxn.c
@@ -11,21 +11,19 @@ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE.
*/
-#define HALT(c) { return emu_halt(u, ins, (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(ram + x, t) } else { ram[(x)] = (y); } }
+#define HALT(c) { return emu_halt(u, ins, (c), pc - 1); }
+#define FLIP { s = (ins & 0x40) ? &u->wst : &u->rst; }
+#define JUMP(x) { if(m2) pc = (x); else pc += (Sint8)(x); }
+#define POKE(x, y) { if(m2) { POKE2(ram + x, y) } else { ram[(x)] = (y); } }
#define PEEK(o, x) { if(m2) { o = PEEK2(ram + x); } else o = ram[(x)]; }
-#define FLIP() { s = (ins & 0x40) ? &u->wst : &u->rst; }
-#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)) } }
+#define PUSH1(y) { if(s->ptr == 0xff) HALT(2) s->dat[s->ptr++] = (y); }
+#define PUSH2(y) { if((tsp = s->ptr) >= 0xfe) HALT(2) t = (y); POKE2(&s->dat[tsp], t); s->ptr = tsp + 2; }
+#define PUSH(y) { if(m2) { PUSH2(y) } else { PUSH1(y) } }
+#define POP1(o) { if(*sp == 0x00) HALT(1) o = s->dat[--*sp]; }
+#define POP2(o) { if((tsp = *sp) <= 0x01) HALT(1) o = PEEK2(&s->dat[tsp - 2]); *sp = tsp - 2; }
+#define POP(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); } }
int
uxn_eval(Uxn *u, Uint16 pc)
@@ -45,13 +43,13 @@ uxn_eval(Uxn *u, Uint16 pc)
switch(opc - (!opc * (ins >> 5))) {
/* Immediate */
case -0x0: /* BRK */ return 1;
- case -0x1: /* JCI */ POP8(b) if(!b) { pc += 2; break; } /* else fallthrough */
+ case -0x1: /* JCI */ POP1(b) if(!b) { pc += 2; break; } /* else fallthrough */
case -0x2: /* JMI */ pc += PEEK2(ram + pc) + 2; break;
- case -0x3: /* JSI */ PUSH16(pc + 2) pc += PEEK2(ram + pc) + 2; break;
+ case -0x3: /* JSI */ PUSH2(pc + 2) pc += PEEK2(ram + pc) + 2; break;
case -0x4: /* LIT */
- case -0x6: /* LITr */ a = ram[pc++]; PUSH8(a) break;
+ case -0x6: /* LITr */ a = ram[pc++]; PUSH1(a) break;
case -0x5: /* LIT2 */
- case -0x7: /* LIT2r */ PUSH16(PEEK2(ram + pc)) pc += 2; break;
+ case -0x7: /* LIT2r */ PUSH2(PEEK2(ram + pc)) pc += 2; break;
/* ALU */
case 0x01: /* INC */ POP(a) PUSH(a + 1) break;
case 0x02: /* POP */ POP(a) break;
@@ -60,22 +58,22 @@ uxn_eval(Uxn *u, Uint16 pc)
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 0x08: /* EQU */ POP(a) POP(b) PUSH1(b == a) break;
+ case 0x09: /* NEQ */ POP(a) POP(b) PUSH1(b != a) break;
+ case 0x0a: /* GTH */ POP(a) POP(b) PUSH1(b > a) break;
+ case 0x0b: /* LTH */ POP(a) POP(b) PUSH1(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) FLIP() PUSH16(pc) JUMP(a) break;
- case 0x0f: /* STH */ POP(a) FLIP() 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 0x0d: /* JCN */ POP(a) POP1(b) if(b) JUMP(a) break;
+ case 0x0e: /* JSR */ POP(a) FLIP PUSH2(pc) JUMP(a) break;
+ case 0x0f: /* STH */ POP(a) FLIP PUSH(a) break;
+ case 0x10: /* LDZ */ POP1(a) PEEK(b, a) PUSH(b) break;
+ case 0x11: /* STZ */ POP1(a) POP(b) POKE(a, b) break;
+ case 0x12: /* LDR */ POP1(a) PEEK(b, pc + (Sint8)a) PUSH(b) break;
+ case 0x13: /* STR */ POP1(a) POP(b) POKE(pc + (Sint8)a, b) break;
+ case 0x14: /* LDA */ POP2(a) PEEK(b, a) PUSH(b) break;
+ case 0x15: /* STA */ POP2(a) POP(b) POKE(a, b) break;
+ case 0x16: /* DEI */ POP1(a) DEVR(b, a) PUSH(b) break;
+ case 0x17: /* DEO */ POP1(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;
@@ -83,7 +81,7 @@ uxn_eval(Uxn *u, Uint16 pc)
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 & 0xf) << (a >> 4)) break;
+ case 0x1f: /* SFT */ POP1(a) POP(b) PUSH(b >> (a & 0xf) << (a >> 4)) break;
}
}
}
diff --git a/src/uxn.h b/src/uxn.h
@@ -15,6 +15,8 @@ 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 DEI(p) ((dei_mask[(p) >> 4] >> ((p) & 0xf)) & 0x1 ? emu_dei(u, (p)) : u->dev[(p)])
/* clang-format on */
