void PicoPower(void)\r
{\r
Pico.m.frame_count = 0;\r
+ SekCycleCnt = SekCycleAim = 0;\r
\r
// clear all memory of the emulated machine\r
memset(&Pico.ram,0,(unsigned char *)&Pico.rom - Pico.ram);\r
}\r
\r
SekReset();\r
+ // ..but do not reset SekCycle* to not desync with addons\r
+\r
// s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).\r
SekSetRealTAS(PicoAHW & PAHW_MCD);\r
- SekCycleCnt = SekCycleAim = 0;\r
\r
Pico.m.dirtyPal = 1;\r
\r
Pico.m.z80_bank68k = 0;\r
Pico.m.z80_reset = 1;\r
- memset(Pico.zram, 0, sizeof(Pico.zram)); // ??\r
\r
PicoDetectRegion();\r
Pico.video.status = 0x3428 | Pico.m.pal; // 'always set' bits | vblank | collision | pal\r
/* sync z80 to 68k */\r
PICO_INTERNAL void PicoSyncZ80(unsigned int m68k_cycles_done)\r
{\r
+ int m68k_cnt;\r
int cnt;\r
- z80_cycle_aim += cycles_68k_to_z80(m68k_cycles_done - last_z80_sync);\r
+\r
+ m68k_cnt = m68k_cycles_done - last_z80_sync;\r
+ z80_cycle_aim += cycles_68k_to_z80(m68k_cnt);\r
cnt = z80_cycle_aim - z80_cycle_cnt;\r
last_z80_sync = m68k_cycles_done;\r
\r
goto end;\r
}\r
\r
- // TODO: MCD+32X\r
- if (PicoAHW & PAHW_MCD) {\r
- PicoFrameMCD();\r
+ if (PicoAHW & PAHW_32X) {\r
+ PicoFrame32x(); // also does MCD+32X\r
goto end;\r
}\r
\r
- if (PicoAHW & PAHW_32X) {\r
- PicoFrame32x();\r
+ if (PicoAHW & PAHW_MCD) {\r
+ PicoFrameMCD();\r
goto end;\r
}\r
\r