1 files changed, 268 insertions, 226 deletions

diff --git a/src/main.c b/src/main.c
index a2661cd..beb65e3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,12 +1,12 @@
 /*
-Copyright (c) 2021 Bad Diode
+   Copyright (c) 2021 Bad Diode
 
-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.
+   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.
+   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+   WITH REGARD TO THIS SOFTWARE.
 */
 
 #include <string.h>
@@ -39,8 +39,10 @@ WITH REGARD TO THIS SOFTWARE.
 
 #ifdef PROF_ENABLE
 #if PROF_ENABLE == 0
+#define TEXT_ENABLE 1
 #define PROF(F,VAR) (profile_start(),(F),(VAR) = profile_stop())
 #elif PROF_ENABLE == 1
+#define TEXT_ENABLE 1
 #define PROF(F,VAR) (profile_start(),(F),(VAR) = MAX(profile_stop(), (VAR)))
 #endif
 #ifndef PROF_SHOW_X
@@ -90,219 +92,254 @@ typedef struct Mouse {
     int y;
 } Mouse;
 
+EWRAM_BSS
+static u8 umem[0x10300];
+
+static Uxn u;
 static Ppu ppu;
-static Device *devscreen;
-static Device *devctrl;
-static Device *devmouse;
-static Device *devaudio;
 
 static Mouse mouse = {SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2};
 
-void
-nil_talk(Device *d, u8 b0, u8 w) {
-    (void)d;
-    (void)b0;
-    (void)w;
-}
-
-void
-console_talk(Device *d, u8 b0, u8 w) {
-    char stmp[2];
-    if(!w) {
-        return;
-    }
-    switch(b0) {
-        case 0x8: stmp[0] = d->dat[0x8]; stmp[1] = 0; txt_printf(stmp); break;
-        case 0x9: txt_printf("0x%02x", d->dat[0x9]); break;
-        case 0xb: txt_printf("0x%04x", mempeek16(d->dat, 0xa)); break;
-        case 0xd: txt_printf("%s", &d->mem[mempeek16(d->dat, 0xc)]); break;
-    }
+int
+uxn_halt(Uxn *u, u8 instr, u8 err, u16 addr) {
+    (void)u;
+    txt_printf("HALTED\n");
+    txt_printf("I: %lu\n", instr);
+    txt_printf("E: %lu\n", err);
+    txt_printf("A: %lu\n", addr);
+    while (true);
 }
 
-void
-system_talk(Device *d, u8 b0, u8 w) {
-    if(!w) {
-        d->dat[0x2] = d->u->wst.ptr;
-        d->dat[0x3] = d->u->rst.ptr;
-    } else {
-        putcolors(&d->dat[0x8]);
+IWRAM_CODE
+u8
+screen_dei(u8 *d, u8 port) {
+    switch(port) {
+        case 0x2: return (SCREEN_WIDTH >> 8);
+        case 0x3: return (SCREEN_WIDTH);
+        case 0x4: return (SCREEN_HEIGHT >> 8);
+        case 0x5: return (SCREEN_HEIGHT);
+        default: return d[port];
     }
-    (void)b0;
 }
 
 IWRAM_CODE
 void
-screen_talk(Device *d, u8 b0, u8 w) {
-   if (!w) {
-        switch(b0) {
-            case 0x2: d->dat[b0] = (SCREEN_WIDTH >> 8); break;
-            case 0x3: d->dat[b0] = (SCREEN_WIDTH); break;
-            case 0x4: d->dat[b0] = (SCREEN_HEIGHT >> 8); break;
-            case 0x5: d->dat[b0] = (SCREEN_HEIGHT); break;
+screen_deo(u8 *ram, u8 *d, u8 port) {
+    switch(port) {
+        case 0xe: {
+            u16 x, y;
+            u8 layer = d[0xe] & 0x40;
+            PEKDEV(x, 0x8);
+            PEKDEV(y, 0xa);
+            ppu_pixel(layer ? ppu.fg : ppu.bg, x, y, d[0xe] & 0x3);
+            if(d[0x6] & 0x01) POKDEV(0x8, x + 1); /* auto x+1 */
+            if(d[0x6] & 0x02) POKDEV(0xa, y + 1); /* auto y+1 */
+            break;
         }
-    } else {
-        switch (b0) {
-            case 0x1: {
-                d->vector = mempeek16(d->dat, 0x0);
-            } break;
-            case 0xe: {
-                u16 x, y;
-                u8 layer = d->dat[0xe] & 0x40;
-                DEVPEEK16(x, 0x8);
-                DEVPEEK16(y, 0xa);
-                ppu_pixel(layer ? ppu.fg : ppu.bg, x, y, d->dat[0xe] & 0x3);
-                if(d->dat[0x6] & 0x01) DEVPOKE16(0x8, x + 1); /* auto x+1 */
-                if(d->dat[0x6] & 0x02) DEVPOKE16(0xa, y + 1); /* auto y+1 */
-            } break;
-            case 0xf: {
-                u16 x, y, dx, dy, addr;
-                u8 twobpp = !!(d->dat[0xf] & 0x80);
-                DEVPEEK16(x, 0x8);
-                DEVPEEK16(y, 0xa);
-                DEVPEEK16(addr, 0xc);
-                u8 n = d->dat[0x6] >> 4;
-                dx = (d->dat[0x6] & 0x01) << 3;
-                dy = (d->dat[0x6] & 0x02) << 2;
-                if(addr > 0x10000 - ((n + 1) << (3 + twobpp))) {
-                    return;
-                }
-                u8 *layer = (d->dat[0xf] & 0x40) ? ppu.fg : ppu.bg;
-                u8 color = d->dat[0xf] & 0xf;
-                u8 flipx = d->dat[0xf] & 0x10;
-                u8 flipy = d->dat[0xf] & 0x20;
-                for(size_t i = 0; i <= n; i++) {
-                    u8 *sprite = &d->mem[addr];
-                    if (twobpp) {
-                        ppu_2bpp(layer, x + dy * i, y + dx * i, sprite, color, flipx, flipy);
-                    } else {
-                        ppu_1bpp(layer, x + dy * i, y + dx * i, sprite, color, flipx, flipy);
-                    }
-                    addr += (d->dat[0x6] & 0x04) << (1 + twobpp);
+        case 0xf: {
+            u16 x, y, dx, dy, addr;
+            u8 n, twobpp = !!(d[0xf] & 0x80);
+            PEKDEV(x, 0x8);
+            PEKDEV(y, 0xa);
+            PEKDEV(addr, 0xc);
+            n = d[0x6] >> 4;
+            dx = (d[0x6] & 0x01) << 3;
+            dy = (d[0x6] & 0x02) << 2;
+            if(addr > 0x10000 - ((n + 1) << (3 + twobpp))) {
+                return;
+            }
+            u8 *layer = (d[0xf] & 0x40) ? ppu.fg : ppu.bg;
+            u8 color = d[0xf] & 0xf;
+            u8 flipx = d[0xf] & 0x10;
+            u8 flipy = d[0xf] & 0x20;
+            for(size_t i = 0; i <= n; i++) {
+                u8 *sprite = &ram[addr];
+                if (twobpp) {
+                    ppu_2bpp(layer, x + dy * i, y + dx * i, sprite, color, flipx, flipy);
+                } else {
+                    ppu_1bpp(layer, x + dy * i, y + dx * i, sprite, color, flipx, flipy);
                 }
-                DEVPOKE16(0xc, addr);   /* auto addr+length */
-                DEVPOKE16(0x8, x + dx); /* auto x+8 */
-                DEVPOKE16(0xa, y + dy); /* auto y+8 */
-            } break;
-            default: break;
+                addr += (d[0x6] & 0x04) << (1 + twobpp);
+            }
+            POKDEV(0xc, addr);   /* auto addr+length */
+            POKDEV(0x8, x + dx); /* auto x+8 */
+            POKDEV(0xa, y + dy); /* auto y+8 */
+            break;
         }
     }
 }
 
-static void
-audio_talk(Device *d, u8 b0, u8 w) {
-    AudioChannel *c = &channels[d - devaudio];
-    if(!w) {
-        if(b0 == 0x2) {
-            mempoke16(d->dat, 0x2, c->pos);
+u8
+audio_dei(int instance, u8 *d, u8 port) {
+    AudioChannel *c = &channels[instance];
+    switch(port) {
+        // case 0x4: return apu_get_vu(instance);
+        case 0x2: {
+            POKDEV(0x2, c->pos);
             c->pos <<= 12; // fixed point.
-        } else if(b0 == 0x4) {
-            // d->dat[0x4] = apu_get_vu(c);
+            break;
         }
-    } else if(b0 == 0xf) {
-        u16 length = mempeek16(d->dat, 0xa);
-        u8 *data = &d->mem[mempeek16(d->dat, 0xc)];
-        u8 pitch = d->dat[0xf] & 0x7f;
-        u16 adsr = mempeek16(d->dat, 0x8);
-        u32 vol = MAX(d->dat[0xe] >> 4, d->dat[0xe] & 0xf) * 4 / 3;
-        bool loop = !(d->dat[0xf] & 0x80);
-        update_channel(c, data, length, pitch, adsr, vol, loop);
     }
+    return d[port];
 }
 
 void
-datetime_talk(Device *d, u8 b0, u8 w) {
-    (void)b0;
-    (void)w;
+audio_deo(int instance, u8 *d, u8 port, Uxn *u) {
+    AudioChannel *c = &channels[instance];
+    if (port == 0xf) {
+        u16 length = 0;
+        u16 adsr = 0;
+        u16 addr = 0;
+        u8 pitch = d[0xf] & 0x7f;
+        PEKDEV(adsr, 0x8);
+        PEKDEV(length, 0xa);
+        PEKDEV(addr, 0xc);
+        u8 *data = &u->ram[addr];
+        u32 vol = MAX(d[0xe] >> 4, d[0xe] & 0xf) * 4 / 3;
+        bool loop = !(d[0xf] & 0x80);
+        update_channel(c, data, length, pitch, adsr, vol, loop);
+    }
+}
+
+u8
+datetime_dei(u8 *d, u8 port) {
     struct tm *t = gmtime(&seconds);
-    t->tm_year += 1900;
-    DEVPOKE16(0x0, t->tm_year);
-    d->dat[0x2] = t->tm_mon;
-    d->dat[0x3] = t->tm_mday;
-    d->dat[0x4] = t->tm_hour;
-    d->dat[0x5] = t->tm_min;
-    d->dat[0x6] = t->tm_sec;
-    d->dat[0x7] = t->tm_wday;
-    DEVPOKE16(0x08, t->tm_yday);
-    d->dat[0xa] = t->tm_isdst;
+    switch(port) {
+        case 0x0: return (t->tm_year + 1900) >> 8;
+        case 0x1: return (t->tm_year + 1900);
+        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 0xa: return t->tm_isdst;
+        default: return d[port];
+    }
 }
 
-void
-file_talk(Device *d, u8 b0, u8 w) {
-    if (w) {
-        u16 a, b, res;
-        UxnFile *f = &uxn_file[d - &d->u->dev[0xa]];
-        switch(b0) {
-            case 0x5: {
-                DEVPEEK16(a, 0x4);
-                DEVPEEK16(b, 0xa);
-                if(b > 0x10000 - a) {
-                    b = 0x10000 - a;
-                }
-                res = file_stat(f, &d->mem[a], b);
-                DEVPOKE16(0x2, res);
-            } break;
-            case 0x6: {
-                // TODO: no file deletion for now
-                // res = file_delete();
-                // DEVPOKE16(0x2, res);
-            } break;
-            case 0x9: {
-                DEVPEEK16(a, 0x8);
-                res = file_init(f, &d->mem[a]);
-                DEVPOKE16(0x2, res);
-            } break;
-            case 0xd: {
-                DEVPEEK16(a, 0xc);
-                DEVPEEK16(b, 0xa);
-                if(b > 0x10000 - a) {
-                    b = 0x10000 - a;
-                }
-                res = file_read(f, &d->mem[a], b);
-                DEVPOKE16(0x2, res);
-            } break;
-            case 0xf: {
-                DEVPEEK16(a, 0xe);
-                DEVPEEK16(b, 0xa);
-                if(b > 0x10000 - a) {
-                    b = 0x10000 - a;
-                }
-                res = file_write(f, &d->mem[a], b, d->dat[0x7]);
-                DEVPOKE16(0x2, res);
-            } break;
+u8
+file_dei(u8 id, u8 *d, u8 port) {
+    UxnFile *c = &uxn_file[id];
+    u16 res;
+    switch(port) {
+        case 0xc:
+        case 0xd: {
+            res = file_read(c, &d[port], 1);
+            POKDEV(0x2, res);
+            break;
         }
     }
+    return d[port];
 }
 
 void
-init_uxn(Uxn *u) {
-    // Initialize PPU.
-    initppu(&ppu, 30, 20);
+file_deo(u8 id, u8 *ram, u8 *d, u8 port) {
+    u16 a, b, res;
+    UxnFile *f = &uxn_file[id];
+    switch(port) {
+        case 0x5: {
+            PEKDEV(a, 0x4);
+            PEKDEV(b, 0xa);
+            if(b > 0x10000 - a) {
+                b = 0x10000 - a;
+            }
+            res = file_stat(f, &ram[a], b);
+            POKDEV(0x2, res);
+        } break;
+        case 0x6: {
+            // TODO: no file deletion for now
+            // res = file_delete();
+            // POKDEV(0x2, res);
+        } break;
+        case 0x9: {
+            PEKDEV(a, 0x8);
+            res = file_init(f, &ram[a]);
+            POKDEV(0x2, res);
+        } break;
+        case 0xd: {
+            PEKDEV(a, 0xc);
+            PEKDEV(b, 0xa);
+            if(b > 0x10000 - a) {
+                b = 0x10000 - a;
+            }
+            res = file_read(f, &ram[a], b);
+            POKDEV(0x2, res);
+        } break;
+        case 0xf: {
+            PEKDEV(a, 0xe);
+            PEKDEV(b, 0xa);
+            if(b > 0x10000 - a) {
+                b = 0x10000 - a;
+            }
+            res = file_write(f, &ram[a], b, d[0x7]);
+            POKDEV(0x2, res);
+        } break;
+    }
+}
 
-    // Enable sound.
-    init_sound();
+void
+console_deo(u8 *d, u8 port) {
+    txt_printf("%c", d[port]);
+}
+
+void
+system_deo(Uxn *u, u8 *d, u8 port) {
+    switch(port) {
+        case 0x2: u->wst = (Stack *)(u->ram + (d[port] ? (d[port] * 0x100) : 0x10000)); break;
+        case 0x3: u->rst = (Stack *)(u->ram + (d[port] ? (d[port] * 0x100) : 0x10100)); break;
+    }
+}
+
+u8
+emu_dei(Uxn *u, u8 addr) {
+    u8 p = addr & 0x0f, d = addr & 0xf0;
+    switch(d) {
+        case 0x20: return screen_dei(&u->dev[d], p);
+        case 0x30: return audio_dei(0, &u->dev[d], p);
+        case 0x40: return audio_dei(1, &u->dev[d], p);
+        case 0x50: return audio_dei(2, &u->dev[d], p);
+        case 0x60: return audio_dei(3, &u->dev[d], p);
+        case 0xa0: return file_dei(0, &u->dev[d], p);
+        case 0xb0: return file_dei(1, &u->dev[d], p);
+        case 0xc0: return datetime_dei(&u->dev[d], p);
+    }
+    return u->dev[addr];
+    return 0;
+}
+
+void
+emu_deo(Uxn *u, u8 addr, u8 v) {
+    u8 p = addr & 0x0f, d = addr & 0xf0;
+    u->dev[addr] = v;
+    switch(d) {
+        case 0x00:
+            system_deo(u, &u->dev[d], p);
+            if(p > 0x7 && p < 0xe)
+                putcolors(&u->dev[0x8]);
+            break;
+        case 0x10: console_deo(&u->dev[d], p); break;
+        case 0x20: screen_deo(u->ram, &u->dev[d], p); break;
+        case 0x30: audio_deo(0, &u->dev[d], p, u); break;
+        case 0x40: audio_deo(1, &u->dev[d], p, u); break;
+        case 0x50: audio_deo(2, &u->dev[d], p, u); break;
+        case 0x60: audio_deo(3, &u->dev[d], p, u); break;
+        case 0xa0: file_deo(0, u->ram, &u->dev[d], p); break;
+        case 0xb0: file_deo(1, u->ram, &u->dev[d], p); break;
+    }
+}
+
+void
+init_uxn(Uxn *u) {
+    // Initialize uxn.
+    u32 fill = 0;
+    dma_fill(umem, fill, 0x10300, 3);
+    uxn_boot(u, umem, emu_dei, emu_deo);
 
     // Copy rom to VM.
-    memcpy(u->ram.dat + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
-
-    // Prepare devices.
-    uxn_port(u, 0x0, "system", system_talk);
-    uxn_port(u, 0x1, "console", console_talk);
-    devscreen = uxn_port(u, 0x2, "screen", screen_talk);
-    devaudio = uxn_port(u, 0x3, "audio0", audio_talk);
-    uxn_port(u, 0x4, "audio1", audio_talk);
-    uxn_port(u, 0x5, "audio2", audio_talk);
-    uxn_port(u, 0x6, "audio3", audio_talk);
-    uxn_port(u, 0x7, "---", nil_talk);
-    devctrl = uxn_port(u, 0x8, "controller", nil_talk);
-    devmouse = uxn_port(u, 0x9, "mouse", nil_talk);
-    uxn_port(u, 0xa, "file1", file_talk);
-    uxn_port(u, 0xb, "file2", file_talk); // TODO: support second file device
-    uxn_port(u, 0xc, "datetime", datetime_talk);
-    uxn_port(u, 0xd, "---", nil_talk);
-    uxn_port(u, 0xe, "---", nil_talk);
-    uxn_port(u, 0xf, "---", nil_talk);
-    mempoke16(devscreen->dat, 2, ppu.hor * 8);
-    mempoke16(devscreen->dat, 4, ppu.ver * 8);
+    memcpy(u->ram + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
 }
 
 IWRAM_CODE
@@ -313,16 +350,18 @@ handle_input(Uxn *u) {
         // Reset control variables on method switch.
         switch (ctrl_methods[ctrl_idx]) {
             case CONTROL_CONTROLLER: {
-                devctrl->dat[2] = 0;
-                uxn_eval(u, mempeek16(devctrl->dat, 0));
-                devctrl->dat[3] = 0;
+                u8 *d = &u->dev[0x80];
+                d[2] = 0;
+                uxn_eval(u, GETVEC(d));
+                d[3] = 0;
             } break;
             case CONTROL_MOUSE: {
-                devmouse->dat[6] = 0;
-                devmouse->dat[7] = 0;
-                mempoke16(devmouse->dat, 0x2, -10);
-                mempoke16(devmouse->dat, 0x4, -10);
-                uxn_eval(u, mempeek16(devmouse->dat, 0));
+                u8 *d = &u->dev[0x90];
+                d[6] = 0;
+                d[7] = 0;
+                POKDEV(0x2, -10);
+                POKDEV(0x4, -10);
+                uxn_eval(u, GETVEC(d));
             } break;
             case CONTROL_KEYBOARD: {
                 toggle_keyboard();
@@ -339,9 +378,10 @@ handle_input(Uxn *u) {
     }
 
     if (ctrl_methods[ctrl_idx] == CONTROL_CONTROLLER) {
-        // TODO: We don't need ifs if we use KEY_INPUTS directly and mayvbe just
+        u8 *d = &u->dev[0x80];
+        // TODO: We don't need ifs if we use KEY_INPUTS directly and maybe just
         // swap some things if needed.
-        u8 *flag = &devctrl->dat[2];
+        u8 *flag = &d[2];
         if (key_tap(KEY_A)) {
             *flag |= 0x01;
         } else {
@@ -383,11 +423,12 @@ handle_input(Uxn *u) {
             *flag &= ~0x80;
         }
 
-        uxn_eval(u, mempeek16(devctrl->dat, 0));
-        devctrl->dat[3] = 0;
+        uxn_eval(u, GETVEC(d));
+        d[3] = 0;
     } else if (ctrl_methods[ctrl_idx] == CONTROL_MOUSE) {
+        u8 *d = &u->dev[0x90];
         // Detect "mouse key press".
-        u8 flag = devmouse->dat[6];
+        u8 flag = d[6];
         if (key_tap(KEY_B)) {
             flag |= 0x01;
         } else if (key_released(KEY_B)) {
@@ -400,12 +441,12 @@ handle_input(Uxn *u) {
         }
 
         // Handle chording.
-        devmouse->dat[6] = flag;
-        if(flag == 0x10 && (devmouse->dat[6] & 0x01)) {
-            devmouse->dat[7] = 0x01;
+        d[6] = flag;
+        if(flag == 0x10 && (d[6] & 0x01)) {
+            d[7] = 0x01;
         }
-        if(flag == 0x01 && (devmouse->dat[6] & 0x10)) {
-            devmouse->dat[7] = 0x10;
+        if(flag == 0x01 && (d[6] & 0x10)) {
+            d[7] = 0x10;
         }
 
         // Detect mouse movement.
@@ -421,10 +462,11 @@ handle_input(Uxn *u) {
         }
 
         // Eval mouse.
-        mempoke16(devmouse->dat, 0x2, mouse.x);
-        mempoke16(devmouse->dat, 0x4, mouse.y);
-        uxn_eval(u, mempeek16(devmouse->dat, 0));
+        POKDEV(0x2, mouse.x);
+        POKDEV(0x4, mouse.y);
+        uxn_eval(u, GETVEC(d));
     } else if (ctrl_methods[ctrl_idx] == CONTROL_KEYBOARD) {
+        u8 *d = &u->dev[0x80];
         if (key_tap(KEY_LEFT)) {
             update_cursor(cursor_position - 1);
         } else if (key_tap(KEY_RIGHT)) {
@@ -441,43 +483,40 @@ handle_input(Uxn *u) {
             switch (symbol) {
                 case 0x7f: {
                     // Backspace.
-                    devctrl->dat[3] = 0x08;
+                    d[3] = 0x08;
                 } break;
                 case 0x14: {
                     // New line.
-                    devctrl->dat[3] = 0x0d;
+                    d[3] = 0x0d;
                 } break;
                 case 0x18: {
                     // Arrow up.
-                    devctrl->dat[2] = 0x10;
+                    d[2] = 0x10;
                 } break;
                 case 0x19: {
                     // Arrow down.
-                    devctrl->dat[2] = 0x20;
+                    d[2] = 0x20;
                 } break;
                 case 0x1b: {
                     // Arrow left.
-                    devctrl->dat[2] = 0x40;
+                    d[2] = 0x40;
                 } break;
                 case 0x1a: {
                     // Arrow right.
-                    devctrl->dat[2] = 0x80;
+                    d[2] = 0x80;
                 } break;
                 default: {
-                    devctrl->dat[3] = symbol;
+                    d[3] = symbol;
                 } break;
             }
-            uxn_eval(u, mempeek16(devctrl->dat, 0));
-            devctrl->dat[3] = 0;
+            uxn_eval(u, GETVEC(d));
+            d[3] = 0;
         }
     }
 }
 
-static Uxn u;
-EWRAM_BSS
-static u8 umem[KB(64)];
-
-int main(void) {
+int
+main(void) {
     // Adjust system wait times.
     SYSTEM_WAIT = SYSTEM_WAIT_CARTRIDGE;
 
@@ -488,16 +527,19 @@ int main(void) {
     irq_init();
     irs_set(IRQ_VBLANK, sound_vsync);
 
-    // Initialize VM.
-    dma_fill(&u, 0, sizeof(u), 3);
-    u.ram.dat = umem;
-    init_uxn(&u);
+    // Initialize PPU.
+    initppu(&ppu, 30, 20);
 
     // Initialize text engine.
+#ifdef TEXT_ENABLE
     txt_init(1, TEXT_LAYER);
     txt_position(0,0);
+#endif
+
+    // Initialize UXN.
+    init_uxn(&u);
 
-    // Initialize sound mixer.
+    // Enable sound.
     init_sound();
 
     // Main loop.
@@ -507,7 +549,7 @@ int main(void) {
     while(true) {
         bios_vblank_wait();
         PROF(handle_input(&u), input_cycles);
-        PROF(uxn_eval(&u, mempeek16(devscreen->dat, 0)), eval_cycles);
+        PROF(uxn_eval(&u, GETVEC(&u.dev[0x20])), eval_cycles);
         PROF(sound_mix(), mix_cycles);
         PROF_SHOW();
         PROF(flipbuf(&ppu), flip_cycles);