Break IRQs again

[pistorm] / emulator.c

diff --git a/emulator.c b/emulator.c
index 4d2fc8a37c8036c5044da7bfa66ce8d520dfecc7..7712be645299f04504c7b7a832a3ee7a59c992cf 100644 (file)
--- a/emulator.c
+++ b/emulator.c
@@ -116,6 +116,8 @@ void *ipl_task(void *args) {
 
   while (1) {
     value = *(gpio + 13);
+    if (value & (1 << PIN_TXN_IN_PROGRESS))
+      goto noppers;
 
     if (!(value & (1 << PIN_IPL_ZERO))) {
       old_irq = irq_delay;
@@ -170,6 +172,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 +183,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,14 +226,16 @@ 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;
   }
 
@@ -629,13 +648,10 @@ switch_config:
 void cpu_pulse_reset(void) {
        m68ki_cpu_core *state = &m68ki_cpu;
   ps_pulse_reset();
-  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)
+  if (cfg->platform->handle_reset)
+    cfg->platform->handle_reset(cfg);
 
        m68k_pulse_reset(state);
 }
@@ -654,6 +670,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;
@@ -679,6 +697,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) {
@@ -711,6 +730,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) {
@@ -802,6 +822,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:
@@ -954,9 +990,11 @@ static inline int32_t platform_write_check(uint8_t type, uint32_t addr, uint32_t
           if (val & 0x10 && !ovl) {
               ovl = 1;
               printf("[MAC] OVL on.\n");
+              handle_ovl_mappings_mac68k(cfg);
           } else if (ovl) {
             ovl = 0;
             printf("[MAC] OVL off.\n");
+            handle_ovl_mappings_mac68k(cfg);
           }
           break;
       }