X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FMemory.c;h=fc6e4de54c48bfe725ba7d4d27cc9c176632cac0;hb=d9153729685381acb0559d8a4fdca47cb839427a;hp=fc25081eb58296ac577a0757fb00453233001b0b;hpb=89fa852dce08d9aab0f19458a4afa246e9839e9e;p=picodrive.git

diff --git a/Pico/cd/Memory.c b/Pico/cd/Memory.c
index fc25081..fc6e4de 100644
--- a/Pico/cd/Memory.c
+++ b/Pico/cd/Memory.c
@@ -30,10 +30,13 @@ typedef unsigned int   u32;
 #define rdprintf(...)
 //#define wrdprintf dprintf
 #define wrdprintf(...)
+//#define plprintf dprintf
+#define plprintf(...)
 
 // -----------------------------------------------------------------
 
 // poller detection
+//#undef USE_POLL_DETECT
 #define POLL_LIMIT 16
 #define POLL_CYCLES 124
 // int m68k_poll_addr, m68k_poll_cnt;
@@ -52,7 +55,9 @@ static u32 m68k_reg_read16(u32 a)
       goto end;
     case 2:
       d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0xc7);
-      dprintf("m68k_regs r3: %02x @%06x", (u8)d, SekPc);
+      // the DMNA delay must only be visible on s68k side (Lunar2, Silpheed)
+      if (Pico_mcd->m.state_flags&2) { d &= ~1; d |= 2; }
+      //printf("m68k_regs r3: %02x @%06x\n", (u8)d, SekPc);
       goto end;
     case 4:
       d = Pico_mcd->s68k_regs[4]<<8;
@@ -117,7 +122,7 @@ void m68k_reg_write8(u32 a, u32 d)
       return;
     case 3: {
       u32 dold = Pico_mcd->s68k_regs[3]&0x1f;
-      dprintf("m68k_regs w3: %02x @%06x", (u8)d, SekPc);
+      //printf("m68k_regs w3: %02x @%06x\n", (u8)d, SekPc);
       d &= 0xc2;
       if ((dold>>6) != ((d>>6)&3))
         dprintf("m68k: prg bank: %i -> %i", (Pico_mcd->s68k_regs[a]>>6), ((d>>6)&3));
@@ -141,7 +146,7 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT
       if ((s68k_poll_adclk&0xfe) == 2 && s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(0); s68k_poll_adclk = 0;
-        //printf("%05i:%03i: s68k poll release, a=%02x\n", Pico.m.frame_count, Pico.m.scanline, a);
+        plprintf("s68k poll release, a=%02x\n", a);
       }
 #endif
       return;
@@ -161,7 +166,7 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT
       if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(0); s68k_poll_adclk = 0;
-        //printf("%05i:%03i: s68k poll release, a=%02x\n", Pico.m.frame_count, Pico.m.scanline, a);
+        plprintf("s68k poll release, a=%02x\n", a);
       }
 #endif
       return;
@@ -172,7 +177,7 @@ void m68k_reg_write8(u32 a, u32 d)
 #ifdef USE_POLL_DETECT
       if ((a&0xfe) == (s68k_poll_adclk&0xfe) && s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(0); s68k_poll_adclk = 0;
-        //printf("%05i:%03i: s68k poll release, a=%02x\n", Pico.m.frame_count, Pico.m.scanline, a);
+        plprintf("s68k poll release, a=%02x\n", a);
       }
 #endif
       return;
@@ -181,6 +186,31 @@ void m68k_reg_write8(u32 a, u32 d)
   dprintf("m68k FIXME: invalid write? [%02x] %02x", a, d);
 }
 
+#ifndef _ASM_CD_MEMORY_C
+static
+#endif
+u32 s68k_poll_detect(u32 a, u32 d)
+{
+#ifdef USE_POLL_DETECT
+  // polling detection
+  if (a == (s68k_poll_adclk&0xff)) {
+    unsigned int clkdiff = SekCyclesDoneS68k() - (s68k_poll_adclk>>8);
+    if (clkdiff <= POLL_CYCLES) {
+      s68k_poll_cnt++;
+      //printf("-- diff: %u, cnt = %i\n", clkdiff, s68k_poll_cnt);
+      if (s68k_poll_cnt > POLL_LIMIT) {
+        SekSetStopS68k(1);
+        plprintf("s68k poll detected @ %06x, a=%02x\n", SekPcS68k, a);
+      }
+      s68k_poll_adclk = (SekCyclesDoneS68k() << 8) | a;
+      return d;
+    }
+  }
+  s68k_poll_adclk = (SekCyclesDoneS68k() << 8) | a;
+  s68k_poll_cnt = 0;
+#endif
+  return d;
+}
 
 #define READ_FONT_DATA(basemask) \
 { \
@@ -206,9 +236,9 @@ u32 s68k_reg_read16(u32 a)
     case 0:
       return ((Pico_mcd->s68k_regs[0]&3)<<8) | 1; // ver = 0, not in reset state
     case 2:
-      d = (Pico_mcd->s68k_regs[a]<<8) | (Pico_mcd->s68k_regs[a+1]&0x1f);
-      dprintf("s68k_regs r3: %02x @%06x", (u8)d, SekPcS68k);
-      goto poll_detect;
+      d = (Pico_mcd->s68k_regs[2]<<8) | (Pico_mcd->s68k_regs[3]&0x1f);
+      //printf("s68k_regs r3: %02x @%06x\n", (u8)d, SekPcS68k);
+      return s68k_poll_detect(a, d);
     case 6:
       return CDC_Read_Reg();
     case 8:
@@ -238,31 +268,10 @@ u32 s68k_reg_read16(u32 a)
 
   d = (Pico_mcd->s68k_regs[a]<<8) | Pico_mcd->s68k_regs[a+1];
 
-  if (a >= 0x0e && a < 0x30) goto poll_detect;
+  if (a >= 0x0e && a < 0x30)
+    return s68k_poll_detect(a, d);
 
   return d;
-
-poll_detect:
-#ifdef USE_POLL_DETECT
-  // polling detection
-  if (a == (s68k_poll_adclk&0xfe)) {
-    unsigned int clkdiff = SekCyclesDoneS68k() - (s68k_poll_adclk>>8);
-    if (clkdiff <= POLL_CYCLES) {
-      s68k_poll_cnt++;
-      //printf("-- diff: %u, cnt = %i\n", clkdiff, s68k_poll_cnt);
-      if (s68k_poll_cnt > POLL_LIMIT) {
-        SekSetStopS68k(1);
-        //printf("%05i:%03i: s68k poll detected @ %06x, a=%02x\n", Pico.m.frame_count, Pico.m.scanline, SekPcS68k, a);
-      }
-      s68k_poll_adclk = (SekCyclesDoneS68k() << 8) | a;
-      return d;
-    }
-  }
-  s68k_poll_adclk = (SekCyclesDoneS68k() << 8) | a;
-  s68k_poll_cnt = 0;
-
-#endif
-  return d;
 }
 
 #ifndef _ASM_CD_MEMORY_C
@@ -279,7 +288,7 @@ void s68k_reg_write8(u32 a, u32 d)
       return; // only m68k can change WP
     case 3: {
       int dold = Pico_mcd->s68k_regs[3];
-      dprintf("s68k_regs w3: %02x @%06x", (u8)d, SekPcS68k);
+      //printf("s68k_regs w3: %02x @%06x\n", (u8)d, SekPcS68k);
       d &= 0x1d;
       d |= dold&0xc2;
       if (d&4) {
@@ -405,6 +414,7 @@ static void OtherWrite8End(u32 a, u32 d, int realsize)
 #include "cell_map.c"
 #endif // !def _ASM_CD_MEMORY_C
 
+
 // -----------------------------------------------------------------
 //                     Read Rom and read Ram
 
@@ -482,7 +492,9 @@ static u16 PicoReadM68k16(u32 a)
   // prg RAM
   if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {
     u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
+    wrdprintf("m68k_prgram r16: [%i,%06x] @%06x", Pico_mcd->s68k_regs[3]>>6, a, SekPc);
     d = *(u16 *)(prg_bank+(a&0x1fffe));
+    wrdprintf("ret = %04x", d);
     goto end;
   }
 
@@ -627,8 +639,11 @@ static void PicoWriteM68k8(u32 a,u8 d)
     return;
   }
 
-  if ((a&0xffffc0)==0xa12000)
+  if ((a&0xffffc0)==0xa12000) {
     rdprintf("m68k_regs w8: [%02x] %02x @%06x", a&0x3f, d, SekPc);
+    m68k_reg_write8(a, d);
+    return;
+  }
 
   OtherWrite8(a,d,8);
 }
@@ -655,6 +670,7 @@ static void PicoWriteM68k16(u32 a,u16 d)
   // prg RAM
   if ((a&0xfe0000)==0x020000 && (Pico_mcd->m.busreq&2)) {
     u8 *prg_bank = Pico_mcd->prg_ram_b[Pico_mcd->s68k_regs[3]>>6];
+    wrdprintf("m68k_prgram w16: [%i,%06x] %04x @%06x", Pico_mcd->s68k_regs[3]>>6, a, d, SekPc);
     *(u16 *)(prg_bank+(a&0x1fffe))=d;
     return;
   }
@@ -683,7 +699,7 @@ static void PicoWriteM68k16(u32 a,u16 d)
 #ifdef USE_POLL_DETECT
       if ((s68k_poll_adclk&0xfe) == 0xe && s68k_poll_cnt > POLL_LIMIT) {
         SekSetStopS68k(0); s68k_poll_adclk = -1;
-        //printf("%05i:%03i: s68k poll release, a=%02x\n", Pico.m.frame_count, Pico.m.scanline, a);
+        plprintf("s68k poll release, a=%02x\n", a);
       }
 #endif
       return;
@@ -750,8 +766,10 @@ static void PicoWriteM68k32(u32 a,u32 d)
     return;
   }
 
-  if ((a&0xffffc0)==0xa12000)
+  if ((a&0xffffc0)==0xa12000) {
     rdprintf("m68k_regs w32: [%02x] %08x @%06x", a&0x3f, d, SekPc);
+    if ((a&0x3e) == 0xe) dprintf("m68k FIXME: w32 [%02x]", a&0x3f);
+  }
 
   OtherWrite16(a,  (u16)(d>>16));
   OtherWrite16(a+2,(u16)d);
@@ -780,7 +798,13 @@ static u8 PicoReadS68k8(u32 a)
   if ((a&0xfffe00) == 0xff8000) {
     a &= 0x1ff;
     rdprintf("s68k_regs r8: [%02x] @ %06x", a, SekPcS68k);
-    if (a >= 0x58 && a < 0x68)
+    if (a >= 0x0e && a < 0x30) {
+      d = Pico_mcd->s68k_regs[a];
+      s68k_poll_detect(a, d);
+      rdprintf("ret = %02x", (u8)d);
+      goto end;
+    }
+    else if (a >= 0x58 && a < 0x68)
          d = gfx_cd_read(a&~1);
     else d = s68k_reg_read16(a&~1);
     if ((a&1)==0) d>>=8;
@@ -863,7 +887,9 @@ static u16 PicoReadS68k16(u32 a)
 
   // prg RAM
   if (a < 0x80000) {
+    wrdprintf("s68k_prgram r16: [%06x] @%06x", a, SekPcS68k);
     d = *(u16 *)(Pico_mcd->prg_ram+a);
+    wrdprintf("ret = %04x", d);
     goto end;
   }
 
@@ -979,7 +1005,6 @@ static u32 PicoReadS68k32(u32 a)
       d  = Pico_mcd->word_ram1M[bank][((a+0)^1)&0x1ffff] << 16;
       d |= Pico_mcd->word_ram1M[bank][((a+1)^1)&0x1ffff];
       d |= d << 4; d &= 0x0f0f0f0f;
-      dprintf("FIXME: decode");
     } else {
       // allow access in any mode, like Gens does
       u16 *pm=(u16 *)(Pico_mcd->word_ram2M+(a&0x3fffe)); d = (pm[0]<<16)|pm[1];
@@ -1002,7 +1027,7 @@ static u32 PicoReadS68k32(u32 a)
 
   // PCM
   if ((a&0xff8000)==0xff0000) {
-    dprintf("FIXME: s68k_pcm r32: [%06x] @%06x", a, SekPcS68k);
+    dprintf("s68k_pcm r32: [%06x] @%06x", a, SekPcS68k);
     a &= 0x7fff;
     if (a >= 0x2000) {
       a >>= 1;
@@ -1058,8 +1083,6 @@ static void decode_write8(u32 a, u8 d, int r3)
   d  &= 0x0f;
   if (!(a&1)) d <<= 4;
 
-  //dprintf("FIXME: decode, r3 = %02x", r3);
-
   if (r3 == 8) {
     if ((!(*pd & (~oldmask))) && d) goto do_it;
   } else if (r3 > 8) {
@@ -1097,15 +1120,11 @@ static void decode_write16(u32 a, u16 d, int r3)
   } else {
     *pd = d;
   }
-
-  //dprintf("FIXME: decode");
 }
 #endif
 
 // -----------------------------------------------------------------
 
-//void PicoWriteS68k8_(u32 a,u8 d);
-//void PicoWriteS68k8__(u32 a,u8 d);
 #ifdef _ASM_CD_MEMORY_C
 void PicoWriteS68k8(u32 a,u8 d);
 #else
@@ -1116,16 +1135,6 @@ static void PicoWriteS68k8(u32 a,u8 d)
 #endif
 
   a&=0xffffff;
-#if 0
-    PicoWriteS68k8_(a, d);
-/*  if ((a&0xfc0000)!=0x080000) {
-    PicoWriteS68k8_(a, d);
-    return;
-  }
-  printf("r3: %02x\n", Pico_mcd->s68k_regs[3]);
-  PicoWriteS68k8__(a,d);*/
-  return;
-#endif
 
   // prg RAM
   if (a < 0x80000) {
@@ -1205,6 +1214,7 @@ static void PicoWriteS68k16(u32 a,u16 d)
 
   // prg RAM
   if (a < 0x80000) {
+    wrdprintf("s68k_prgram w16: [%06x] %04x @%06x", a, d, SekPcS68k);
     *(u16 *)(Pico_mcd->prg_ram+a)=d;
     return;
   }
@@ -1302,6 +1312,7 @@ static void PicoWriteS68k32(u32 a,u32 d)
       gfx_cd_write16(a,   d>>16);
       gfx_cd_write16(a+2, d&0xffff);
     } else {
+      if ((a&0x1fe) == 0xe) dprintf("s68k FIXME: w32 [%02x]", a&0x3f);
       s68k_reg_write8(a,   d>>24);
       s68k_reg_write8(a+1,(d>>16)&0xff);
       s68k_reg_write8(a+2,(d>>8) &0xff);