Draw directly to the FRAMEBUFFER

2 files changed, 4 insertions, 63 deletions

diff --git a/src/uxn/devices/ppu.c b/src/uxn/devices/ppu.c
index b977f97..06d84bf 100644
--- a/src/uxn/devices/ppu.c
+++ b/src/uxn/devices/ppu.c
@@ -121,26 +121,7 @@ void
 drawpixel(Ppu *p, Uint16 x, Uint16 y, Uint8 color)
 {
         if(x >= p->pad && x <= p->width - p->pad - 1 && y >= p->pad && y <= p->height - p->pad - 1)
-                p->output[y * p->width + x] = p->colors[color];
-}
-
-void
-drawdebugger(Ppu *p, Uint8 *stack, Uint8 ptr)
-{
-        Uint8 i, x, y, b;
-        for(i = 0; i < 0x20; ++i) { /* memory */
-                x = ((i % 8) * 3 + 1) * 8, y = (i / 8 + 1) * 8, b = stack[i];
-                puticn(p, p->bg, x, y, font[(b >> 4) & 0xf], 1 + (ptr == i) * 0x7, 0, 0);
-                puticn(p, p->bg, x + 8, y, font[b & 0xf], 1 + (ptr == i) * 0x7, 0, 0);
-        }
-        for(x = 0; x < 0x20; ++x) {
-                drawpixel(p, x, p->height / 2, 2);
-                drawpixel(p, p->width - x, p->height / 2, 2);
-                drawpixel(p, p->width / 2, p->height - x, 2);
-                drawpixel(p, p->width / 2, x, 2);
-                drawpixel(p, p->width / 2 - 16 + x, p->height / 2, 2);
-                drawpixel(p, p->width / 2, p->height / 2 - 16 + x, 2);
-        }
+                FRAMEBUFFER[y][x] = p->colors[color];
 }
 
 void
diff --git a/src/uxn/uxn.c b/src/uxn/uxn.c
index 796a980..08b3b9b 100644
--- a/src/uxn/uxn.c
+++ b/src/uxn/uxn.c
@@ -116,14 +116,6 @@ void (*ops[])(Uxn *u) = {
 
 #pragma mark - Core
 
-int
-haltuxn(Uxn *u, char *name, int id)
-{
-        txt_printf("Halted: %s#%04x, at 0x%04x\n", name, id, u->ram.ptr);
-        u->ram.ptr = 0;
-        return 0;
-}
-
 void
 opcuxn(Uxn *u, Uint8 instr)
 {
@@ -140,46 +132,14 @@ opcuxn(Uxn *u, Uint8 instr)
 }
 
 int
-stepuxn(Uxn *u, Uint8 instr)
-{
-        opcuxn(u, instr);
-        if(u->wst.error)
-                return haltuxn(u, u->wst.error == 1 ? "Working-stack underflow" : "Working-stack overflow", instr);
-        if(u->rst.error)
-                return haltuxn(u, u->rst.error == 1 ? "Return-stack underflow" : "Return-stack overflow", instr);
-        return 1;
-}
-
-int
 evaluxn(Uxn *u, Uint16 vec)
 {
         u->ram.ptr = vec;
         u->wst.error = 0;
         u->rst.error = 0;
-        while(u->ram.ptr)
-                if(!stepuxn(u, u->ram.dat[u->ram.ptr++]))
-                        return 0;
-        return 1;
-}
-
-int
-bootuxn(Uxn *u)
-{
-        size_t i;
-        char *cptr = (char *)u;
-        for(i = 0; i < sizeof(*u); i++)
-                cptr[i] = 0;
-        return 1;
-}
-
-int
-loaduxn(Uxn *u, char *filepath)
-{
-        FILE *f;
-        if(!(f = fopen(filepath, "rb")))
-                return haltuxn(u, "Missing input rom.", 0);
-        fread(u->ram.dat + PAGE_PROGRAM, sizeof(u->ram.dat) - PAGE_PROGRAM, 1, f);
-        txt_printf("Uxn loaded[%s].\n", filepath);
+        while(u->ram.ptr) {
+            opcuxn(u, u->ram.dat[u->ram.ptr++]);
+    }
         return 1;
 }