famec hack, CPU debug in CD mode

[picodrive.git] / Pico / Pico.c

diff --git a/Pico/Pico.c b/Pico/Pico.c
index ce3e340..aec354d 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -137,7 +137,7 @@ int PicoReset(int hard)
   Pico.m.pal=pal;\r
   Pico.video.status = 0x3408 | pal; // always set bits | vblank | pal\r
 \r
-  sound_reset(); // pal must be known here\r
+  PsndReset(); // pal must be known here\r
 \r
   if (PicoMCD & 1) {\r
     PicoResetMCD(hard);\r
@@ -202,12 +202,10 @@ static __inline void SekRunM68k(int cyc)
 {\r
   int cyc_do;\r
   SekCycleAim+=cyc;\r
-  //printf("aim: %i, cnt: %i\n", SekCycleAim, SekCycleCnt);\r
   if((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;\r
-  //printf("cyc_do: %i\n", cyc_do);\r
-#if   defined(EMU_C68K) && defined(EMU_M68K)\r
-  // this means we do run-compare Cyclone vs Musashi\r
-  SekCycleCnt+=CM_compareRun(cyc_do);\r
+#if defined(EMU_CORE_DEBUG)\r
+  // this means we do run-compare\r
+  SekCycleCnt+=CM_compareRun(cyc_do, 0);\r
 #elif defined(EMU_C68K)\r
   PicoCpuCM68k.cycles=cyc_do;\r
   CycloneRun(&PicoCpuCM68k);\r
@@ -215,7 +213,7 @@ static __inline void SekRunM68k(int cyc)
 #elif defined(EMU_M68K)\r
   SekCycleCnt+=m68k_execute(cyc_do);\r
 #elif defined(EMU_F68K)\r
-  SekCycleCnt+=m68k_emulate(cyc_do);\r
+  SekCycleCnt+=fm68k_emulate(cyc_do+1);\r
 #endif\r
 }\r
 \r
@@ -223,9 +221,8 @@ static __inline void SekStep(void)
 {\r
   // this is required for timing sensitive stuff to work\r
   int realaim=SekCycleAim; SekCycleAim=SekCycleCnt+1;\r
-#if   defined(EMU_C68K) && defined(EMU_M68K)\r
-  // this means we do run-compare Cyclone vs Musashi\r
-  SekCycleCnt+=CM_compareRun(1);\r
+#if defined(EMU_CORE_DEBUG)\r
+  SekCycleCnt+=CM_compareRun(1, 0);\r
 #elif defined(EMU_C68K)\r
   PicoCpuCM68k.cycles=1;\r
   CycloneRun(&PicoCpuCM68k);\r
@@ -233,7 +230,7 @@ static __inline void SekStep(void)
 #elif defined(EMU_M68K)\r
   SekCycleCnt+=m68k_execute(1);\r
 #elif defined(EMU_F68K)\r
-  SekCycleCnt+=m68k_emulate(1);\r
+  SekCycleCnt+=fm68k_emulate(1);\r
 #endif\r
   SekCycleAim=realaim;\r
 }\r
@@ -258,17 +255,17 @@ static __inline void getSamples(int y)
 \r
   if(y == 224) {\r
     if(emustatus & 2)\r
-         curr_pos += sound_render(curr_pos, PsndLen-PsndLen/2);\r
-    else curr_pos  = sound_render(0, PsndLen);\r
+         curr_pos += PsndRender(curr_pos, PsndLen-PsndLen/2);\r
+    else curr_pos  = PsndRender(0, PsndLen);\r
     if (emustatus&1) emustatus|=2; else emustatus&=~2;\r
     if (PicoWriteSound) PicoWriteSound(curr_pos);\r
     // clear sound buffer\r
-    sound_clear();\r
+    PsndClear();\r
   }\r
   else if(emustatus & 3) {\r
     emustatus|= 2;\r
     emustatus&=~1;\r
-    curr_pos = sound_render(0, PsndLen/2);\r
+    curr_pos = PsndRender(0, PsndLen/2);\r
   }\r
 }\r
 \r
@@ -296,7 +293,7 @@ static void PicoRunZ80Simple(int line_from, int line_to)
   if (PicoOpt&1) {\r
     // we have ym2612 enabled, so we have to run Z80 in lines, so we could update DAC and timers\r
     for (line = line_from; line < line_to; line++) {\r
-      sound_timers_and_dac(line);\r
+      Psnd_timers_and_dac(line);\r
       if ((line == 224 || line == line_sample) && PsndOut) getSamples(line);\r
       if (line == 32 && PsndOut) emustatus &= ~1;\r
       if (line >= line_from_r && line < line_to_r)\r
@@ -316,7 +313,7 @@ static int PicoFrameSimple(void)
   int cycles_68k_vblock,cycles_68k_block;\r
 \r
   // split to 16 run calls for active scan, for vblank split to 2 (ntsc), 3 (pal 240), 4 (pal 224)\r
-  if (Pico.m.pal && (pv->reg[1]&8)) { // 240 lines\r
+  if (Pico.m.pal && (pv->reg[1]&8)) {\r
     if(pv->reg[1]&8) { // 240 lines\r
       cycles_68k_block  = 7329;  // (488*240+148)/16.0, -4\r
       cycles_68k_vblock = 11640; // (72*488-148-68)/3.0, 0\r
@@ -378,14 +375,6 @@ static int PicoFrameSimple(void)
     PicoRunZ80Simple(line, lines);\r
   }\r
 \r
-  // here we render sound if ym2612 is disabled\r
-  if (!(PicoOpt&1) && PsndOut) {\r
-    int len = sound_render(0, PsndLen);\r
-    if (PicoWriteSound) PicoWriteSound(len);\r
-    // clear sound buffer\r
-    sound_clear();\r
-  }\r
-\r
   // render screen\r
   if (!PicoSkipFrame)\r
   {\r
@@ -401,6 +390,17 @@ static int PicoFrameSimple(void)
       for (y=0;y<224;y++) PicoLine(y);\r
 #endif\r
     else PicoFrameFull();\r
+#ifdef DRAW_FINISH_FUNC\r
+    DRAW_FINISH_FUNC();\r
+#endif\r
+  }\r
+\r
+  // here we render sound if ym2612 is disabled\r
+  if (!(PicoOpt&1) && PsndOut) {\r
+    int len = PsndRender(0, PsndLen);\r
+    if (PicoWriteSound) PicoWriteSound(len);\r
+    // clear sound buffer\r
+    PsndClear();\r
   }\r
 \r
   // a gap between flags set and vint\r