Enable specifying the ROM image as a command-line argument

Author: mesheets

emu_server.py

@@ -118,6 +118,7 @@ def __init__(self, ip, port):
         self.out_queue = Queue()
         self.init_done = False
         self.run_forever = True
+        self.rom_path = None
         self.firmware_path = None
         self.conn = None
         self.lcd_state = {key: False for key in range(0, 100)}
@@ -127,6 +128,9 @@ def __init__(self, ip, port):
             MOTOR_C: {"dir": DIR_OFF, "speed": 0}
         }
 
+    def set_rom_path(self, rom_path):
+        self.rom_path = rom_path
+
     def set_firmware_path(self, firmware_path):
         self.firmware_path = firmware_path
 
@@ -279,9 +283,11 @@ def run_server(self):
 
     ip = "localhost"
     port = int(sys.argv[1])
-    firmware = sys.argv[2]
+    rom = sys.argv[2]
+    firmware = sys.argv[3]
 
     emu_obj = EmuServer(ip, port)
+    emu_obj.set_rom_path(rom)
     emu_obj.set_firmware_path(firmware)
 
     emu_obj.run_server()

main.c

@@ -34,7 +34,7 @@
 
 extern void periph_init(int port);
 extern void savefile_init(void);
-extern void mem_init(void);
+extern void mem_init(char *);
 extern void frame_init(void);
 extern void lcd_init(void);
 extern void t16_init(void);
@@ -63,7 +63,7 @@ extern void bibo_init(void);
 int main(int argc, char**argv) {
     int guiserverport = 0;
     int arg_index = 1;
-	char* rom_file = NULL;
+	char *rom_file = NULL;
 
     for (arg_index = 1; arg_index < argc; arg_index++) {
         if (strcmp(argv[arg_index], "-d") == 0) {
@@ -83,8 +83,8 @@ int main(int argc, char**argv) {
             exit(1);
         }
     }
-   
-    mem_init();
+    
+    mem_init(rom_file);
     frame_init();
     ser_init();
     db_init();

memory.c

@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "h8300.h"
 #include "memory.h"
 
@@ -64,6 +65,7 @@ uint8  memtype[65536];
 register_funcs port[0x10000 - 0xff88];
 int wait_states;
 
+char *rom_file_name = NULL;
 
 
 
@@ -178,44 +180,33 @@ void SET_WORD(uint16 addr, uint16 val) {
  * \return 1 on success, 0 otherwise.
  */
 int read_rom() {
-    char *brickemu_dir;
-    char filename[512];
+    int result = 0;
+    char *rom_file_ext = NULL;
     FILE *romfile;
-    brickemu_dir = getenv("BRICKEMU_DIR");
-    if (!brickemu_dir)
-        brickemu_dir=".";
 
-    snprintf(filename, sizeof(filename), "%s/rom.coff", brickemu_dir);
-    romfile = fopen(filename, "rb");
-
-    if (romfile && coff_init(romfile)) {
-        coff_read(romfile, 0);
-        coff_symbols(romfile, 0);
-        fclose(romfile);
-        return 1;
-    }
-
-    snprintf(filename, sizeof(filename), "%s/rom.bin", brickemu_dir);
-    romfile = fopen(filename, "rb");
-
-    if (romfile) {
-        fread(memory, 0x4000, 1, romfile);
-        fclose(romfile);
-        return 1;
-    }
+    if (rom_file_name && (rom_file_ext = strrchr(rom_file_name, '.'))) {
 
+        if ((strcmp(rom_file_ext, ".coff") == 0) && (romfile = fopen(rom_file_name, "rb"))) {
+            if (coff_init(romfile)) {
+                coff_read(romfile, 0);
+                coff_symbols(romfile, 0);
+                result = 1;
+            }
+        } else if ((strcmp(rom_file_ext, ".bin") == 0) && (romfile = fopen(rom_file_name, "rb"))) {
+            fread(memory, 0x4000, 1, romfile);
+            result = 1;
+        } else if ((strcmp(rom_file_ext, ".srec") == 0) && (romfile = fopen(rom_file_name, "r"))) {
+            if (srec_read(romfile, 0) >= 0) {
+                result = 1;
+            }
+        }
 
-    snprintf(filename, sizeof(filename), "%s/rom.srec", brickemu_dir);
-    romfile = fopen(filename, "r");
-    if (romfile) {
-        if (srec_read(romfile, 0) >= 0) {
+        if (romfile) {
             fclose(romfile);
-            return 1;
         }
-        fclose(romfile);
     }
 
-    return 0;
+    return result;
 }
 
 /** \brief initialize brick memory 
@@ -227,12 +218,14 @@ int read_rom() {
  * must be named "rom.bin" or "rom.srec".
  * \return 1 on success, 0 otherwise.
  */
-void mem_init() {
+void mem_init(char *rom_file) {
     int i;
 
+    rom_file_name = rom_file;
     if (!read_rom()) {
         fprintf(stderr, "Please provide a ROM image (coff, binary, or srec format).\n");
         fprintf(stderr, "If extracting the ROM image, save it to a rom.bin or rom.srec file.\n");
+        fflush(stderr);
         abort();
     }
 

tests/conftest.py

@@ -18,6 +18,7 @@ def pytest_configure():
     pytest.emu_obj = None
     pytest.emu = None
     pytest.ir_server = None
+    rom = "./rom.coff"
     firmware = "../brickos_bibo/kernel/bibo.coff"
     ir_server_bin = "./ir-server"
     emu_bin = "./emu"
@@ -26,6 +27,7 @@ def pytest_configure():
     slot = 1
     resp = None
     pytest.emu_obj = EmuServer("localhost", find_free_port())
+    pytest.emu_obj.set_rom_path(rom)
     pytest.emu_obj.set_firmware_path(firmware)
 
     try:
@@ -35,7 +37,7 @@ def pytest_configure():
         emu_serv.daemon = True
         emu_serv.start()
         pytest.emu = subprocess.Popen(
-            [emu_bin, "-guiserverport", f"{pytest.emu_obj.port}"], stdout=subprocess.PIPE
+            [emu_bin, "-guiserverport", f"{pytest.emu_obj.port}", "-rom", ], stdout=subprocess.PIPE
         )
 
         while not pytest.emu_obj.emulator_status_up():