Update UXN core to latest version

This modernizes the uxn core and emulator approach (dei/deo instead of
_talk), forgoing the previous uxn-fast core implementation. As
a consequence, there are some performance regressions. That tradeoff
gives us an easier way of keeping uxngba up to date as it follows more
closely the upstream version.

1 files changed, 18 insertions, 34 deletions

diff --git a/src/uxn.h b/src/uxn.h
index 5d68528..f9bee16 100644
--- a/src/uxn.h
+++ b/src/uxn.h
@@ -1,8 +1,5 @@
 #ifndef UXNGBA_UXN_H
 #define UXNGBA_UXN_H
-
-#include <stdio.h>
-
 /*
 Copyright (c) 2021 Devine Lu Linvega
 
@@ -15,43 +12,30 @@ WITH REGARD TO THIS SOFTWARE.
 */
 
 #define PAGE_PROGRAM 0x0100
-#define DEVPEEK16(o, x) { (o) = (d->dat[(x)] << 8) + d->dat[(x) + 1]; }
-#define DEVPOKE16(x, y) { d->dat[(x)] = (y) >> 8; d->dat[(x) + 1] = (y); }
 
-typedef struct {
-        u8 ptr, kptr, error;
-        u8 dat[256];
-} Stack;
+/* clang-format off */
 
-typedef struct {
-        u16 ptr;
-        u8 *dat;
-} Memory;
+#define GETVEC(d) ((d)[0] << 8 | (d)[1])
+#define POKDEV(x, y) { d[(x)] = (y) >> 8; d[(x) + 1] = (y); }
+#define PEKDEV(o, x) { (o) = (d[(x)] << 8) + d[(x) + 1]; }
 
-typedef struct Device {
-        struct Uxn *u;
-        u8 addr, dat[16], *mem;
-        u16 vector;
-        void (*talk)(struct Device *d, u8, u8);
-} Device;
+/* clang-format on */
+
+typedef struct {
+        u8 dat[255], ptr;
+} Stack;
 
 typedef struct Uxn {
-        Stack wst, rst, *src, *dst;
-        Memory ram;
-        Device dev[16];
+        u8 *ram, *dev;
+        Stack *wst, *rst;
+        u8 (*dei)(struct Uxn *u, u8 addr);
+        void (*deo)(struct Uxn *u, u8 addr, u8 value);
 } Uxn;
 
-struct Uxn;
-
-static inline void mempoke8(u8 *m, u16 a, u8 b) { m[a] = b; }
-static inline u8 mempeek8(u8 *m, u16 a) { return m[a]; }
-static inline void mempoke16(u8 *m, u16 a, u16 b) { mempoke8(m, a, b >> 8); mempoke8(m, a + 1, b); }
-static inline u16 mempeek16(u8 *m, u16 a) { return (mempeek8(m, a) << 8) + mempeek8(m, a + 1); }
-static inline void devpoke8(Device *d, u8 a, u8 b) { d->dat[a & 0xf] = b; d->talk(d, a & 0x0f, 1); }
-static inline u8 devpeek8(Device *d, u8 a) { d->talk(d, a & 0x0f, 0); return d->dat[a & 0xf];  }
-static inline void devpoke16(Device *d, u8 a, u16 b) { devpoke8(d, a, b >> 8); devpoke8(d, a + 1, b); }
-static inline u16 devpeek16(Device *d, u16 a) { return (devpeek8(d, a) << 8) + devpeek8(d, a + 1); }
+typedef u8 Dei(Uxn *u, u8 addr);
+typedef void Deo(Uxn *u, u8 addr, u8 value);
 
-int uxn_eval(Uxn *u, u16 vec);
-Device *uxn_port(Uxn *u, u8 id, char *name, void (*talkfn)(Device *, u8, u8));
+int uxn_halt(Uxn *u, u8 instr, u8 err, u16 addr);
+int uxn_boot(Uxn *u, u8 *ram, Dei *dei, Deo *deo);
+int uxn_eval(Uxn *u, u16 pc);
 #endif // UXNGBA_UXN_H