bugfixes, adjusted famec timing

[picodrive.git] / Pico / Pico.c

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 22bdb19..38c8233 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -202,11 +202,9 @@ 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
+#if defined(EMU_CORE_DEBUG)\r
+  // this means we do run-compare\r
   SekCycleCnt+=CM_compareRun(cyc_do);\r
 #elif defined(EMU_C68K)\r
   PicoCpuCM68k.cycles=cyc_do;\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,8 +221,7 @@ 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
+#if defined(EMU_CORE_DEBUG)\r
   SekCycleCnt+=CM_compareRun(1);\r
 #elif defined(EMU_C68K)\r
   PicoCpuCM68k.cycles=1;\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