Add A314 Amiga binaries

[pistorm] / emulator.c

diff --git a/emulator.c b/emulator.c
index bbd69f0a6346e4b43cae65863a1813d826505e72..ec2d0f172d20653153a9dde0cc68880678c7b24b 100644 (file)
--- a/emulator.c
+++ b/emulator.c
@@ -14,6 +14,7 @@
 #include "platforms/amiga/net/pi-net.h"
 #include "platforms/amiga/net/pi-net-enums.h"
 #include "platforms/amiga/pistorm-dev/pistorm-dev.h"
+#include "platforms/amiga/pistorm-dev/pistorm-dev-enums.h"
 #include "gpio/ps_protocol.h"
 
 #include <assert.h>
@@ -59,7 +60,7 @@ extern uint8_t gayle_emulation_enabled;
 extern uint8_t gayle_a4k_int;
 extern volatile unsigned int *gpio;
 extern volatile uint16_t srdata;
-extern uint8_t realtime_graphics_debug;
+extern uint8_t realtime_graphics_debug, emulator_exiting;
 extern uint8_t rtg_on;
 uint8_t realtime_disassembly, int2_enabled = 0;
 uint32_t do_disasm = 0, old_level;
@@ -430,6 +431,11 @@ void sigint_handler(int sig_num) {
     cfg->platform->shutdown(cfg);
   }
 
+  while (!emulator_exiting) {
+    emulator_exiting = 1;
+    usleep(0);
+  }
+
   printf("IRQs triggered: %lld\n", trig_irq);
   printf("IRQs serviced: %lld\n", serv_irq);
 
@@ -456,6 +462,9 @@ int main(int argc, char *argv[]) {
       } else {
         g++;
         cfg = load_config_file(argv[g]);
+        if (cfg) {
+          set_pistorm_devcfg_filename(argv[g]);
+        }
       }
     }
     else if (strcmp(argv[g], "--keyboard-file") == 0 || strcmp(argv[g], "--kbfile") == 0) {
@@ -469,7 +478,10 @@ int main(int argc, char *argv[]) {
   }
 
 switch_config:
-  if (load_new_config) {
+  srand(clock());
+
+  if (load_new_config != 0) {
+    uint8_t config_action = load_new_config - 1;
     load_new_config = 0;
     free_config_file(cfg);
     if (cfg) {
@@ -477,7 +489,19 @@ switch_config:
       cfg = NULL;
     }
 
-    cfg = load_config_file(get_pistorm_devcfg_filename());
+    /*for(int i = 0; i < 2 * SIZE_MEGA; i++) {
+      write8(i, 0);
+    }*/
+
+    switch(config_action) {
+      case PICFG_LOAD:
+      case PICFG_RELOAD:
+        cfg = load_config_file(get_pistorm_devcfg_filename());
+        break;
+      case PICFG_DEFAULT:
+        cfg = load_config_file("default.cfg");
+        break;
+    }
   }
 
   if (!cfg) {
@@ -587,14 +611,16 @@ switch_config:
   m68k_set_cpu_type(cpu_type);
   cpu_pulse_reset();
 
-  pthread_t ipl_tid, cpu_tid, kbd_tid;
+  pthread_t ipl_tid = 0, cpu_tid, kbd_tid;
   int err;
-  err = pthread_create(&ipl_tid, NULL, &ipl_task, NULL);
-  if (err != 0)
-    printf("[ERROR] Cannot create IPL thread: [%s]", strerror(err));
-  else {
-    pthread_setname_np(ipl_tid, "pistorm: ipl");
-    printf("IPL thread created successfully\n");
+  if (ipl_tid == 0) {
+    err = pthread_create(&ipl_tid, NULL, &ipl_task, NULL);
+    if (err != 0)
+      printf("[ERROR] Cannot create IPL thread: [%s]", strerror(err));
+    else {
+      pthread_setname_np(ipl_tid, "pistorm: ipl");
+      printf("IPL thread created successfully\n");
+    }
   }
 
   // create keyboard task
@@ -618,7 +644,12 @@ switch_config:
   // wait for cpu task to end before closing up and finishing
   pthread_join(cpu_tid, NULL);
 
-  if (!load_new_config)
+  while (!emulator_exiting) {
+    emulator_exiting = 1;
+    usleep(0);
+  }
+
+  if (load_new_config == 0)
     printf("[MAIN] All threads appear to have concluded; ending process\n");
 
   if (mouse_fd != -1)
@@ -626,7 +657,7 @@ switch_config:
   if (mem_fd)
     close(mem_fd);
 
-  if (load_new_config)
+  if (load_new_config != 0)
     goto switch_config;
 
   if (cfg->platform->shutdown) {
@@ -638,18 +669,13 @@ switch_config:
 
 void cpu_pulse_reset(void) {
   ps_pulse_reset();
-  //write_reg(0x00);
-  // printf("Status Reg%x\n",read_reg());
-  //usleep(100000);
-  //write_reg(0x02);
-  // printf("Status Reg%x\n",read_reg());
   if (cfg->platform->handle_reset)
     cfg->platform->handle_reset(cfg);
 
   //m68k_write_memory_16(INTENA, 0x7FFF);
   ovl = 1;
-  m68k_write_memory_8(0xbfe201, 0x0001);  // AMIGA OVL
-  m68k_write_memory_8(0xbfe001, 0x0001);  // AMIGA OVL high (ROM@0x0)
+  //m68k_write_memory_8(0xbfe201, 0x0001);  // AMIGA OVL
+  //m68k_write_memory_8(0xbfe001, 0x0001);  // AMIGA OVL high (ROM@0x0)
 
   m68k_pulse_reset();
 }
@@ -843,9 +869,11 @@ unsigned int m68k_read_memory_32(unsigned int address) {
       case PLATFORM_AMIGA: { \
         if (address >= PISCSI_OFFSET && address < PISCSI_UPPER) { \
           handle_piscsi_write(address, value, a); \
+          return; \
         } \
         if (address >= PINET_OFFSET && address < PINET_UPPER) { \
           handle_pinet_write(address, value, a); \
+          return; \
         } \
         if (address >= PIGFX_RTG_BASE && address < PIGFX_UPPER) { \
           rtg_write((address & 0x0FFFFFFF), value, a); \