Ensure we are not executing zero vectors

3 files changed, 67 insertions, 5 deletions

diff --git a/src/input.c b/src/input.c
index 375bd23..689479e 100644
--- a/src/input.c
+++ b/src/input.c
@@ -7,6 +7,7 @@ typedef enum {
 const ControlMethod ctrl_methods[] = {
     CONTROL_CONTROLLER,
     CONTROL_MOUSE,
+    CONTROL_KEYBOARD,
 };
 static ControlMethod ctrl_idx = 0;
 
diff --git a/src/main.c b/src/main.c
index cb6091f..231d8e7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -163,6 +163,12 @@ deo_system(u8 *dev, u8 port) {
 u16
 dei_system(u8 *dev, u8 port) {
     switch (port) {
+        case 0x0:
+        case 0x2:
+        case 0x6:
+        case 0x8:
+        case 0xa:
+        case 0xc: return PEEK2(dev + port);
         case 0x4: {
             // TODO: Return wst_ptr, but is it the offset instead?
         } break;
@@ -173,25 +179,68 @@ dei_system(u8 *dev, u8 port) {
     }
 }
 
-u8
+u16
 dei_datetime(u8 *dev, u8 port) {
     struct tm *t = gmtime(&seconds);
     switch(port) {
-        case 0x0: return (t->tm_year + 1900) >> 8;
-        case 0x1: return (t->tm_year + 1900);
+        case 0x0: return (t->tm_year + 1900);
+        case 0x1: return (t->tm_year + 1900) >> 8;
         case 0x2: return t->tm_mon;
         case 0x3: return t->tm_mday;
         case 0x4: return t->tm_hour;
         case 0x5: return t->tm_min;
         case 0x6: return t->tm_sec;
         case 0x7: return t->tm_wday;
-        case 0x8: return t->tm_yday >> 8;
-        case 0x9: return t->tm_yday;
+        case 0x8: return t->tm_yday;
+        case 0x9: return t->tm_yday >> 8;
         case 0xa: return t->tm_isdst;
         default: return dev[port];
     }
 }
 
+u16
+dei_audio(u8 *dev, u8 port) {
+    // txt_printf("AUDIO DEI!\n");
+    // TODO: Find proper instance.
+    AudioChannel *c = &channels[0];
+    switch(port) {
+        case 0x0:
+        case 0x8:
+        case 0xa:
+        case 0x2: // TODO: return the position
+        case 0xc: return PEEK2(dev + port);
+        // case 0x2: {
+        //     POKE2(d + 0x2, c->pos);
+        //     c->pos <<= 12; // fixed point.
+        //     break;
+        // }
+        // case 0x4: return apu_get_vu(instance);
+        // TODO: return the current envelope loudness (0x00-0xff).
+        default: return dev[port];
+    }
+    return dev[port];
+}
+
+void
+deo_audio(u8 *dev, u8 port) {
+    // txt_printf("AUDIO DEO!\n");
+    // TODO: Find proper instance.
+    AudioChannel *c = &channels[0];
+    if (port == 0xf) {
+        u16 length = 0;
+        u16 adsr = 0;
+        u16 addr = 0;
+        u8 pitch = dev[0xf] & 0x7f;
+        adsr = PEEK2(dev + 0x8);
+        length = PEEK2(dev + 0xa);
+        addr = PEEK2(dev + 0xc);
+        u8 *data = &uxn_ram[addr];
+        u32 vol = MAX(dev[0xe] >> 4, dev[0xe] & 0xf) * 4 / 3;
+        bool loop = !(dev[0xf] & 0x80);
+        update_channel(c, data, length, pitch, adsr, vol, loop);
+    }
+}
+
 void
 deo_stub(u8 *dev, u8 port) {
     (void)dev;
@@ -232,6 +281,14 @@ init_uxn() {
     deo_map[0x1] = deo_console;
     deo_map[0x2] = deo_screen;
     dei_map[0x2] = dei_screen;
+    deo_map[0x3] = deo_audio;
+    dei_map[0x3] = dei_audio;
+    deo_map[0x4] = deo_audio;
+    dei_map[0x4] = dei_audio;
+    deo_map[0x5] = deo_audio;
+    dei_map[0x5] = dei_audio;
+    deo_map[0x6] = deo_audio;
+    dei_map[0x6] = dei_audio;
     dei_map[0xc] = dei_datetime;
     dei_map[0x9] = dei_mouse;
 }
diff --git a/src/uxn-core.s b/src/uxn-core.s
index 362f0d4..7d73b18 100644
--- a/src/uxn-core.s
+++ b/src/uxn-core.s
@@ -27,6 +27,10 @@ rst_ptr: .word rst
 @
 .global uxn_eval_asm
 uxn_eval_asm:
+    @ Ensure PC is not null.
+    cmp     r0, #0
+    bxeq    lr
+
     @ Initialization.
     push    {r4-r7}
     ldr     r1, wst_ptr