32x: poll_detect tweaks, debug unification

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@800 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index eb49da7..44cabd7 100644 (file)
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -105,10 +105,6 @@ static void p32x_start_blank(void)
 
 static __inline void run_m68k(int cyc)
 {
-  if (Pico32x.emu_flags & P32XF_68KPOLL) {
-    SekCycleCnt += cyc;
-    return;
-  }
 #if defined(EMU_C68K)
   PicoCpuCM68k.cycles = cyc;
   CycloneRun(&PicoCpuCM68k);

diff --git a/pico/32x/memory.c b/pico/32x/memory.c
index 9c8f5fb..1f08ab4 100644 (file)
--- a/pico/32x/memory.c
+++ b/pico/32x/memory.c
@@ -158,8 +158,18 @@ static u32 p32x_reg_read16(u32 a)
   if ((a & 0x30) == 0x20)
     return sh2_comm_faker(a);
 #else
-  if ((a & 0x30) == 0x20 && p32x_poll_detect(&m68k_poll, a, SekCyclesDoneT(), 0)) {
-    SekEndTimeslice(16);
+  if ((a & 0x30) == 0x20) {
+    // evil X-Men proto polls in a dbra loop and expects it to expire..
+    static u32 dr2 = 0;
+    if (SekDar(2) != dr2)
+      m68k_poll.cnt = 0;
+    dr2 = SekDar(2);
+
+    if (p32x_poll_detect(&m68k_poll, a, SekCyclesDoneT(), 0)) {
+      SekSetStop(1);
+      SekEndTimeslice(16);
+    }
+    dr2 = SekDar(2);
   }
 #endif
 
@@ -406,7 +416,8 @@ static void p32x_sh2reg_write8(u32 a, u32 d, int cpuid)
   if ((a & 0x30) == 0x20) {
     u8 *r8 = (u8 *)Pico32x.regs;
     r8[a ^ 1] = d;
-    p32x_poll_undetect(&m68k_poll, 0);
+    if (p32x_poll_undetect(&m68k_poll, 0))
+      SekSetStop(0);
     p32x_poll_undetect(&sh2_poll[cpuid ^ 1], 0);
     return;
   }
@@ -419,7 +430,8 @@ static void p32x_sh2reg_write16(u32 a, u32 d, int cpuid)
   // comm
   if ((a & 0x30) == 0x20 && Pico32x.regs[a/2] != d) {
     Pico32x.regs[a / 2] = d;
-    p32x_poll_undetect(&m68k_poll, 0);
+    if (p32x_poll_undetect(&m68k_poll, 0))
+      SekSetStop(0);
     p32x_poll_undetect(&sh2_poll[cpuid ^ 1], 0);
     return;
   }

diff --git a/pico/debug.c b/pico/debug.c
index ac8f120..79f201b 100644 (file)
--- a/pico/debug.c
+++ b/pico/debug.c
@@ -38,19 +38,14 @@ char *PDebugMain(void)
        !!(SRam.flags & SRF_ENABLED), !!(SRam.flags & SRF_EEPROM), SRam.eeprom_type); MVP;
   sprintf(dstrp, "sram range: %06x-%06x, reg: %02x\n", SRam.start, SRam.end, Pico.m.sram_reg); MVP;
   sprintf(dstrp, "pend int: v:%i, h:%i, vdp status: %04x\n", bit(pv->pending_ints,5), bit(pv->pending_ints,4), pv->status); MVP;
-  sprintf(dstrp, "pal: %i, hw: %02x, frame#: %i\n", Pico.m.pal, Pico.m.hardware, Pico.m.frame_count); MVP;
+  sprintf(dstrp, "pal: %i, hw: %02x, frame#: %i, cycles: %i\n", Pico.m.pal, Pico.m.hardware, Pico.m.frame_count, SekCyclesDoneT()); MVP;
+  sprintf(dstrp, "M68k: PC: %06x, SR: %04x, irql: %i\n", SekPc, SekSr, SekIrqLevel); MVP;
 #if defined(EMU_C68K)
-  sprintf(dstrp, "M68k: PC: %06x, st_flg: %x, cycles: %u\n", SekPc, PicoCpuCM68k.state_flags, SekCyclesDoneT()); MVP;
-  sprintf(dstrp, "d0=%08x, a0=%08x, osp=%08x, irql=%i\n", PicoCpuCM68k.d[0], PicoCpuCM68k.a[0], PicoCpuCM68k.osp, PicoCpuCM68k.irq); MVP;
-  sprintf(dstrp, "d1=%08x, a1=%08x,  sr=%04x\n", PicoCpuCM68k.d[1], PicoCpuCM68k.a[1], CycloneGetSr(&PicoCpuCM68k)); dstrp+=strlen(dstrp); MVP;
-  for(r=2; r < 8; r++) {
-    sprintf(dstrp, "d%i=%08x, a%i=%08x\n", r, PicoCpuCM68k.d[r], r, PicoCpuCM68k.a[r]); MVP;
-  }
-#elif defined(EMU_M68K)
-  sprintf(dstrp, "M68k: PC: %06x, cycles: %u, irql: %i\n", SekPc, SekCyclesDoneT(), PicoCpuMM68k.int_level>>8); MVP;
-#elif defined(EMU_F68K)
-  sprintf(dstrp, "M68k: PC: %06x, cycles: %u, irql: %i\n", SekPc, SekCyclesDoneT(), PicoCpuFM68k.interrupts[0]); MVP;
+  sprintf(dstrp - 1, ", st_flg: %x\n", PicoCpuCM68k.state_flags); MVP;
 #endif
+  for (r = 0; r < 8; r++) {
+    sprintf(dstrp, "d%i=%08x, a%i=%08x\n", r, SekDar(r), r, SekDar(r+8)); MVP;
+  }
   sprintf(dstrp, "z80Run: %i, z80_reset: %i, z80_bnk: %06x\n", Pico.m.z80Run, Pico.m.z80_reset, Pico.m.z80_bank68k<<15); MVP;
   z80_debug(dstrp); MVP;
   if (strlen(dstr) > sizeof(dstr))
@@ -72,7 +67,8 @@ char *PDebug32x(void)
       i*2, r[i+0], r[i+1], r[i+2], r[i+3], r[i+4], r[i+5], r[i+6], r[i+7]); MVP;
   }
   r = Pico32x.sh2_regs;
-  sprintf(dstrp, "SH: %04x %04x %04x      IRQs: %02x\n", r[0], r[1], r[2], Pico32x.sh2irqs); MVP;
+  sprintf(dstrp, "SH: %04x %04x %04x      IRQs: %02x  eflags: %02x\n",
+    r[0], r[1], r[2], Pico32x.sh2irqs, Pico32x.emu_flags); MVP;
 
   i = 0;
   r = Pico32x.vdp_regs;

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 6e76e75..b84b131 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -45,12 +45,15 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #define SekEndTimesliceS68k(after) PicoCpuCS68k.cycles=after\r
 #define SekPc (PicoCpuCM68k.pc-PicoCpuCM68k.membase)\r
 #define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase)\r
+#define SekDar(x) PicoCpuCM68k.d[x]\r
+#define SekSr     CycloneGetSr(&PicoCpuCM68k)\r
 #define SekSetStop(x) { PicoCpuCM68k.state_flags&=~1; if (x) { PicoCpuCM68k.state_flags|=1; PicoCpuCM68k.cycles=0; } }\r
 #define SekSetStopS68k(x) { PicoCpuCS68k.state_flags&=~1; if (x) { PicoCpuCS68k.state_flags|=1; PicoCpuCS68k.cycles=0; } }\r
 #define SekIsStoppedS68k() (PicoCpuCS68k.state_flags&1)\r
 #define SekShouldInterrupt (PicoCpuCM68k.irq > (PicoCpuCM68k.srh&7))\r
 \r
 #define SekInterrupt(i) PicoCpuCM68k.irq=i\r
+#define SekIrqLevel     PicoCpuCM68k.irq\r
 \r
 #ifdef EMU_M68K\r
 #define EMU_CORE_DEBUG\r
@@ -69,6 +72,8 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 #define SekEndTimesliceS68k(after) PicoCpuFS68k.io_cycle_counter=after\r
 #define SekPc     fm68k_get_pc(&PicoCpuFM68k)\r
 #define SekPcS68k fm68k_get_pc(&PicoCpuFS68k)\r
+#define SekDar(x) PicoCpuFM68k.dreg[x].D\r
+#define SekSr     PicoCpuFM68k.sr\r
 #define SekSetStop(x) { \\r
        PicoCpuFM68k.execinfo &= ~FM68K_HALTED; \\r
        if (x) { PicoCpuFM68k.execinfo |= FM68K_HALTED; PicoCpuFM68k.io_cycle_counter = 0; } \\r
@@ -81,6 +86,7 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 #define SekShouldInterrupt fm68k_would_interrupt()\r
 \r
 #define SekInterrupt(irq) PicoCpuFM68k.interrupts[0]=irq\r
+#define SekIrqLevel       PicoCpuFM68k.interrupts[0]\r
 \r
 #ifdef EMU_M68K\r
 #define EMU_CORE_DEBUG\r
@@ -100,6 +106,8 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 #define SekEndTimesliceS68k(after) PicoCpuMS68k.cyc_remaining_cycles=after\r
 #define SekPc m68k_get_reg(&PicoCpuMM68k, M68K_REG_PC)\r
 #define SekPcS68k m68k_get_reg(&PicoCpuMS68k, M68K_REG_PC)\r
+#define SekDar(x) PicoCpuMM68k.dar[x]\r
+#define SekSr m68k_get_reg(&PicoCpuMM68k, M68K_REG_SR)\r
 #define SekSetStop(x) { \\r
        if(x) { SET_CYCLES(0); PicoCpuMM68k.stopped=STOP_LEVEL_STOP; } \\r
        else PicoCpuMM68k.stopped=0; \\r
@@ -117,6 +125,7 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
        m68k_set_irq(irq); \\r
        m68k_set_context(oldcontext); \\r
 }\r
+#define SekIrqLevel (PicoCpuMM68k.int_level >> 8)\r
 \r
 #endif\r
 #endif // EMU_M68K\r