M xywrun.c → xywrun.c

@@ -829,36 +829,13 @@ 
 //// Main run function
 int xyw_run(const char *input)
 {
-    // Load bytecode into memory
-    FILE *fp = fopen(input, "rb");
-    if (!fp)
+    atexit(xyw_teardown_devices);
+
+    if (load_and_launch(input, NULL) != 0)
     {
-        fprintf(stderr, "Error - Could not open file [%s]\n", input);
         return -1;
     }
-    size_t bytes_read = fread(&xyw_memory[USER_MEMORY_START], 1, MEMORY_SIZE - USER_MEMORY_START, fp);
-    if (bytes_read == 0)
-    {
-        fprintf(stderr, "Error - Could not read file contents [%s]\n", input);
-        fclose(fp);
-        return -1;
-    }
-    XYW_DBG("Loaded %zu bytes into memory\n", bytes_read);
-    fclose(fp);
-    xyw_memory[SYSTEM_STATE] |= SYSTEM_STATE_RUNNING;
-    // Setup devices
-    for (int i = 0; i < XYW_TOTAL_DEVICES; i++)
-    {
-        if (xyw_devices[i].setup)
-        {
-            xyw_devices[i].setup(xyw_devices[i].data);
-        }
-    }
-    atexit(xyw_teardown_devices);
-    // Set direct page to device page by default
-    xyw_memory[SYSTEM_PAGE] = 0xff;
 
-    int eval_result = xyw_eval(0x0000);
-
-    return eval_result;
+    XYW_DBG("Loaded image into memory\n");
+    return xyw_eval(0x0000);
 }