clean up chip-8 into its own file

1 files changed, 3 insertions, 101 deletions

diff --git a/sources/main.c b/sources/main.c
index 8c4ac97..2036b73 100644
--- a/sources/main.c
+++ b/sources/main.c
@@ -9,89 +9,12 @@
 #include <endian.h>
 
 #include "bits.c"
-#include "fnt.c"
 #include "log.c"
 
+#include "chip8.c"
+#include "meta/disasm.c"
+#include "meta/exec.c"
 
-#define C8_RESET_VECTOR     0x200
-#define C8_CYCLES_PER_FRAME 1000
-
-
-typedef struct
-{
-    u16 pc;
-    u8  sp;
-
-    u16 i;
-    u16 keys;
-
-    u64 cycles;
-
-            /* timers: */
-    u8  dt; /* - delay */
-    u8  st; /* - sound */
-
-    bool running;
-
-    union
-    {
-        struct
-        {
-            u8  v[16];
-            u64 disp[32];
-            u8  font[sizeof(fnt)];
-            u16 stack[16];
-
-        } sys;
-        u8 ram[4*KB];
-    } mem;
-
-} chip8;
-
-#define V       mem.sys.v
-#define STACK   mem.sys.stack
-#define DISPLAY mem.sys.disp
-#define FONT    mem.sys.font
-#define RAM     mem.ram
-
-#include "instr.c"
-
-void c8_reset(chip8* c8)
-{
-    assert(c8);
-    assert(sizeof(c8->mem) > sizeof(fnt));
-    assert(sizeof(c8->mem) >= 4*KB);
-
-    memcpy(c8->FONT, fnt, sizeof(fnt));
-
-    c8->pc = C8_RESET_VECTOR;
-    c8->running = true;
-}
-
-void c8_dump_state(chip8* c8, bool stack)
-{
-    int i = 0;
-
-    for(i = 0; i < (int)sizeof(c8->V); i += 4)
-    {
-        printf("      V%x: %02X (%-3d) ",  i+0, c8->V[i+0], c8->V[i+0]);
-        printf("V%x: %02X (%-3d) ",  i+1, c8->V[i+1], c8->V[i+1]);
-        printf("V%x: %02X (%-3d) ",  i+2, c8->V[i+2], c8->V[i+2]);
-        printf("V%x: %02X (%-3d)\n", i+3, c8->V[i+3], c8->V[i+3]);
-    }
-
-    printf("      I:%04X SP: %02X DT: %02X ST: %02X\n", c8->i, c8->sp, c8->dt, c8->st);
-
-    if(stack)
-    {
-        printf("stack:\n");
-        for(i = 0; i < (int)sizeof(c8->STACK); i += 2)
-        {
-            printf("      %-2d: %04X ",  i+0, c8->STACK[i+0]);
-            printf("%-2d: %04X\n", i+1, c8->STACK[i+1]);
-        }
-    }
-}
 
 int main(int argc, char** argv)
 {
@@ -162,32 +85,11 @@ int main(int argc, char** argv)
     {
         char buf[512] = {0};
 
-        if(c8.pc >= sizeof(c8.mem))
-        {
-            report(ERR, "PC Overflow!\n");
-            c8.running = false;
-        }
-
-        if(c8.pc & 0x0001)
-        {
-            report(ERR, "PC is not aligned!\n");
-            c8.running = false;
-        }
-
         c8_disasm(c8.RAM, c8.pc, buf);
         printf("%04X:   %s\n", c8.pc, buf);
 
         c8_exec(c8.RAM, c8.pc, &c8);
         c8_dump_state(&c8, false);
-
-        c8.cycles++;
-        if((c8.cycles % C8_CYCLES_PER_FRAME) == 0)
-        {
-            if(c8.dt) c8.dt--;
-            if(c8.st) c8.st--;
-        }
-
-        c8.pc += 2;
     }
 
     return 0;