avoid false sharing between the do_reset and amiga_reset variable that caused the...

[pistorm] / emulator.c

diff --git a/emulator.c b/emulator.c
index 968f52e7bd430c988034566d401d08039c322d37..0e11d3201a3844230b40f091274f374ea08d67ee 100644 (file)
--- a/emulator.c
+++ b/emulator.c
@@ -104,18 +104,27 @@ unsigned int loop_cycles = 300, irq_status = 0;
 struct emulator_config *cfg = NULL;
 char keyboard_file[256] = "/dev/input/event1";
 
-uint64_t trig_irq = 0, serv_irq = 0;
-uint16_t irq_delay = 0;
-unsigned int amiga_reset=0, amiga_reset_last=0;
-unsigned int do_reset=0;
+const uint16_t irq_delay = 0;
+
+struct DoReset
+{
+       char pad0[64];
+       unsigned int value;
+       char pad1[64];
+};
+
+volatile struct DoReset do_reset = {0};
 
 void *ipl_task(void *args) {
   printf("IPL thread running\n");
   uint16_t old_irq = 0;
   uint32_t value;
+  unsigned int amiga_reset=0, amiga_reset_last=0;
 
   while (1) {
     value = *(gpio + 13);
+    if (value & (1 << PIN_TXN_IN_PROGRESS))
+      goto noppers;
 
     if (!(value & (1 << PIN_IPL_ZERO))) {
       old_irq = irq_delay;
@@ -140,7 +149,7 @@ void *ipl_task(void *args) {
         //usleep(0);
       }
     }
-    if(do_reset==0)
+    if(do_reset.value==0)
     {
       amiga_reset=(value & (1 << PIN_RESET));
       if(amiga_reset!=amiga_reset_last)
@@ -149,7 +158,7 @@ void *ipl_task(void *args) {
         if(amiga_reset==0)
         {
           printf("Amiga Reset is down...\n");
-          do_reset=1;
+          do_reset.value=1;
           M68K_END_TIMESLICE;
         }
         else
@@ -170,6 +179,7 @@ void *ipl_task(void *args) {
     }*/
     //usleep(0);
     //NOP NOP
+noppers:
     NOP NOP NOP NOP NOP NOP NOP NOP
     //NOP NOP NOP NOP NOP NOP NOP NOP
     //NOP NOP NOP NOP NOP NOP NOP NOP
@@ -180,6 +190,20 @@ void *ipl_task(void *args) {
   return args;
 }
 
+static inline unsigned int inline_read_status_reg() {
+  *(gpio + 7) = (REG_STATUS << PIN_A0);
+  *(gpio + 7) = 1 << PIN_RD;
+  *(gpio + 7) = 1 << PIN_RD;
+  *(gpio + 7) = 1 << PIN_RD;
+  *(gpio + 7) = 1 << PIN_RD;
+
+  unsigned int value = *(gpio + 13);
+
+  *(gpio + 10) = 0xffffec;
+
+  return (value >> 8) & 0xffff;
+}
+
 void *cpu_task() {
        m68ki_cpu_core *state = &m68ki_cpu;
        m68k_pulse_reset(state);
@@ -209,20 +233,22 @@ cpu_loop:
     }
   }
 
-  if (irq) {
-      last_irq = ((read_reg() & 0xe000) >> 13);
-      if (last_irq != last_last_irq) {
+  while (irq) {
+      last_irq = ((inline_read_status_reg() & 0xe000) >> 13);
+      if (last_irq != 0 && last_irq != last_last_irq) {
         last_last_irq = last_irq;
         M68K_SET_IRQ(last_irq);
       }
-  } else if (!irq && last_last_irq != 0) {
-    M68K_SET_IRQ(0);
+      m68k_execute(state, 50);
+  }
+  if (!irq && last_last_irq != 0) {
+    //M68K_SET_IRQ(0);
     last_last_irq = 0;
   }
 
-  if (do_reset) {
+  if (do_reset.value) {
     cpu_pulse_reset();
-    do_reset=0;
+    do_reset.value=0;
     usleep(1000000); // 1sec
     rtg_on=0;
 //    while(amiga_reset==0);
@@ -420,8 +446,6 @@ void sigint_handler(int sig_num) {
     usleep(0);
   }
 
-  printf("IRQs triggered: %lld\n", trig_irq);
-  printf("IRQs serviced: %lld\n", serv_irq);
 
   exit(0);
 }
@@ -651,6 +675,8 @@ void cdtv_dmac_reg_idx_write(uint8_t value);
 uint32_t cdtv_dmac_read(uint32_t address, uint8_t type);
 void cdtv_dmac_write(uint32_t address, uint32_t value, uint8_t type);
 
+unsigned int garbage = 0;
+
 static inline void inline_write_16(unsigned int address, unsigned int data) {
   *(gpio + 0) = GPFSEL0_OUTPUT;
   *(gpio + 1) = GPFSEL1_OUTPUT;
@@ -676,6 +702,7 @@ static inline void inline_write_16(unsigned int address, unsigned int data) {
   *(gpio + 2) = GPFSEL2_INPUT;
 
   while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
+  NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP
 }
 
 static inline void inline_write_8(unsigned int address, unsigned int data) {
@@ -708,6 +735,7 @@ static inline void inline_write_8(unsigned int address, unsigned int data) {
   *(gpio + 2) = GPFSEL2_INPUT;
 
   while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
+  NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP NOP
 }
 
 static inline void inline_write_32(unsigned int address, unsigned int value) {
@@ -799,6 +827,22 @@ static inline uint32_t ps_read(uint8_t type, uint32_t addr) {
   return 0;
 }
 
+static inline void ps_write(uint8_t type, uint32_t addr, uint32_t val) {
+  switch (type) {
+    case OP_TYPE_BYTE:
+      inline_write_8(addr, val);
+      return;
+    case OP_TYPE_WORD:
+      inline_write_16(addr, val);
+      return;
+    case OP_TYPE_LONGWORD:
+      inline_write_32(addr, val);
+      return;
+  }
+  // This shouldn't actually happen.
+  return;
+}
+
 static inline int32_t platform_read_check(uint8_t type, uint32_t addr, uint32_t *res) {
   switch (cfg->platform->id) {
     case PLATFORM_AMIGA: