loading msgs, bugfixes

[picodrive.git] / Pico / cd / Pico.c

diff --git a/Pico/cd/Pico.c b/Pico/cd/Pico.c
index 770eddb..4cfbbbc 100644 (file)
--- a/Pico/cd/Pico.c
+++ b/Pico/cd/Pico.c
@@ -30,9 +30,9 @@ void PicoExitMCD(void)
 
 int PicoResetMCD(int hard)
 {
-  memset(Pico_mcd->prg_ram,  0, sizeof(Pico_mcd->prg_ram));
-  memset(Pico_mcd->word_ram, 0, sizeof(Pico_mcd->word_ram));
-  memset(Pico_mcd->pcm_ram, 0, sizeof(Pico_mcd->pcm_ram));
+  memset(Pico_mcd->prg_ram,    0, sizeof(Pico_mcd->prg_ram));
+  memset(Pico_mcd->word_ram2M, 0, sizeof(Pico_mcd->word_ram2M));
+  memset(Pico_mcd->pcm_ram,    0, sizeof(Pico_mcd->pcm_ram));
   if (hard) {
          int fmt_size = sizeof(formatted_bram);
          memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram));
@@ -83,6 +83,57 @@ static __inline void SekRunS68k(int cyc)
 #endif
 }
 
+#define PS_STEP_M68K ((488<<16)/20) // ~24
+//#define PS_STEP_S68K 13
+
+#ifndef _ASM_CD_PICO_C
+static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
+{
+  int cycn, cycn_s68k, cyc_do;
+  int d_cm = 0, d_cs = 0, ex;
+  SekCycleAim+=cyc_m68k;
+  SekCycleAimS68k+=cyc_s68k;
+
+//  fprintf(stderr, "=== start %3i/%3i [%3i/%3i] {%05i.%i} ===\n", cyc_m68k, cyc_s68k,
+//             SekCycleAim-SekCycleCnt, SekCycleAimS68k-SekCycleCntS68k, Pico.m.frame_count, Pico.m.scanline);
+
+  /* loop 488 downto 0 in steps of PS_STEP */
+  for (cycn = (488<<16)-PS_STEP_M68K; cycn >= 0; cycn -= PS_STEP_M68K)
+  {
+    ex = 0;
+    cycn_s68k = (cycn + cycn/2 + cycn/8) >> 16;
+//fprintf(stderr, "%3i/%3i:  ", cycn>>16, cycn_s68k);
+    if ((cyc_do = SekCycleAim-SekCycleCnt-(cycn>>16)) > 0) {
+#if defined(EMU_C68K)
+      PicoCpu.cycles = cyc_do;
+      CycloneRun(&PicoCpu);
+      SekCycleCnt += cyc_do - PicoCpu.cycles;
+#elif defined(EMU_M68K)
+      m68k_set_context(&PicoM68kCPU);
+      SekCycleCnt += (ex = m68k_execute(cyc_do));
+#endif
+    }
+//fprintf(stderr, "%3i ", ex); d_cm += ex; ex = 0;
+    if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
+#if defined(EMU_C68K)
+      PicoCpuS68k.cycles = cyc_do;
+      CycloneRun(&PicoCpuS68k);
+      SekCycleCntS68k += cyc_do - PicoCpuS68k.cycles;
+#elif defined(EMU_M68K)
+      m68k_set_context(&PicoS68kCPU);
+      SekCycleCntS68k += (ex = m68k_execute(cyc_do));
+#endif
+    }
+//fprintf(stderr, "%3i\n", ex); d_cs += ex;
+  }
+
+//fprintf(stderr, "==    end %3i/%3i    ==\n", d_cm, d_cs);
+}
+#else
+void SekRunPS(int cyc_m68k, int cyc_s68k);
+#endif
+
+
 static __inline void check_cd_dma(void)
 {
        int ddx;
@@ -230,23 +281,12 @@ static int PicoFrameHintsMCD(void)
     // Run scanline:
       //dprintf("m68k starting exec @ %06x", SekPc);
     if(Pico.m.dma_bytes) SekCycleCnt+=CheckDMA();
-    SekRun(cycles_68k);
-    if ((Pico_mcd->m.busreq&3) == 1) { // no busreq/no reset
-#if 0
-           int i;
-           FILE *f = fopen("prg_ram.bin", "wb");
-           for (i = 0; i < 0x80000; i+=2)
-           {
-                   int tmp = Pico_mcd->prg_ram[i];
-                   Pico_mcd->prg_ram[i] = Pico_mcd->prg_ram[i+1];
-                   Pico_mcd->prg_ram[i+1] = tmp;
-           }
-           fwrite(Pico_mcd->prg_ram, 1, 0x80000, f);
-           fclose(f);
-           exit(1);
-#endif
-      //dprintf("s68k starting exec @ %06x", SekPcS68k);
-      SekRunS68k(cycles_s68k);
+    if((PicoOpt & 0x2000) && (Pico_mcd->m.busreq&3) == 1) {
+      SekRunPS(cycles_68k, cycles_s68k); // "better/perfect sync"
+    } else {
+      SekRun(cycles_68k);
+      if ((Pico_mcd->m.busreq&3) == 1) // no busreq/no reset
+        SekRunS68k(cycles_s68k);
     }
 
     if((PicoOpt&4) && Pico.m.z80Run) {