1 files changed, 32 insertions, 7 deletions

diff --git a/src/main.c b/src/main.c
index 7d77051..1a4d6f6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,7 +11,6 @@
 #include "shorthand.h"
 #include "ppu.c"
 #include "uxn-fast.c"
-#include "rom.c"
 
 static Uxn u;
 static Device *devscreen;
@@ -140,6 +139,7 @@ screen_talk(Device *d, u8 b0, u8 w) {
             default: break;
         }
     }
+    reqdraw = 1;
 }
 
 static void
@@ -166,15 +166,35 @@ file_talk(Device *d, u8 b0, u8 w) {
     (void)w;
 }
 
+
+void
+load_rom(char *file_name) {
+    FILE *file = fopen(file_name, "r");
+    if (!file) {
+        fprintf(stderr, "error: couldn't open file: %s\n", file_name);
+        exit(EXIT_FAILURE);
+    }
+
+    fseek(file, 0, SEEK_END);
+    size_t rom_size = ftell(file);
+    fseek(file, 0, SEEK_SET);
+    char *uxn_rom = malloc(rom_size);
+    fread(uxn_rom, 1, rom_size, file);
+    memcpy(u.ram.dat + PAGE_PROGRAM, uxn_rom, rom_size);
+    fclose(file);
+    free(uxn_rom);
+}
+
 void
-init_uxn() {
+init_uxn(char *file_name) {
     // Clear UXN memory.
     memset(&u, 0, sizeof(Uxn));
 
-    ppu_init();
-
     // Copy rom to VM.
-    memcpy(u.ram.dat + PAGE_PROGRAM, uxn_rom, sizeof(uxn_rom));
+    load_rom(file_name);
+
+    // Initialize framebuffer.
+    ppu_init();
 
     // Prepare devices.
     uxn_port(&u, 0x0, "system", system_talk);
@@ -198,8 +218,13 @@ init_uxn() {
 }
 
 int
-main(void) {
-    init_uxn();
+main(int argc, char *argv[]) {
+    if (argc <= 1) {
+        // TODO: If no rom is given, embed the uxn compiler rom.
+        fprintf(stderr, "error: no rom selected\n");
+        exit(EXIT_FAILURE);
+    }
+    init_uxn(argv[1]);
 
         // Main loop.
     uxn_eval(&u, 0x0100);