X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.c;h=38c8233ce9a15ec9c79c8d71d18239959d06b48c;hb=03e4f2a349247334666c87abe3a908df72d23051;hp=22bdb19912d7ff31710e6aadc7b2417139a6c114;hpb=80db44425aa5b46185fb9a64520f4b6f5d494ba5;p=picodrive.git diff --git a/Pico/Pico.c b/Pico/Pico.c index 22bdb19..38c8233 100644 --- a/Pico/Pico.c +++ b/Pico/Pico.c @@ -202,11 +202,9 @@ static __inline void SekRunM68k(int cyc) { int cyc_do; SekCycleAim+=cyc; - //printf("aim: %i, cnt: %i\n", SekCycleAim, SekCycleCnt); if((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return; - //printf("cyc_do: %i\n", cyc_do); -#if defined(EMU_C68K) && defined(EMU_M68K) - // this means we do run-compare Cyclone vs Musashi +#if defined(EMU_CORE_DEBUG) + // this means we do run-compare SekCycleCnt+=CM_compareRun(cyc_do); #elif defined(EMU_C68K) PicoCpuCM68k.cycles=cyc_do; @@ -215,7 +213,7 @@ static __inline void SekRunM68k(int cyc) #elif defined(EMU_M68K) SekCycleCnt+=m68k_execute(cyc_do); #elif defined(EMU_F68K) - SekCycleCnt+=m68k_emulate(cyc_do); + SekCycleCnt+=fm68k_emulate(cyc_do+1); #endif } @@ -223,8 +221,7 @@ static __inline void SekStep(void) { // this is required for timing sensitive stuff to work int realaim=SekCycleAim; SekCycleAim=SekCycleCnt+1; -#if defined(EMU_C68K) && defined(EMU_M68K) - // this means we do run-compare Cyclone vs Musashi +#if defined(EMU_CORE_DEBUG) SekCycleCnt+=CM_compareRun(1); #elif defined(EMU_C68K) PicoCpuCM68k.cycles=1; @@ -233,7 +230,7 @@ static __inline void SekStep(void) #elif defined(EMU_M68K) SekCycleCnt+=m68k_execute(1); #elif defined(EMU_F68K) - SekCycleCnt+=m68k_emulate(1); + SekCycleCnt+=fm68k_emulate(1); #endif SekCycleAim=realaim; }