return 0;\r
}\r
\r
+void SekStepM68k(void)\r
+{\r
+ SekCycleAim=SekCycleCnt+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
+ SekCycleCnt+=1-PicoCpuCM68k.cycles;\r
+#elif defined(EMU_M68K)\r
+ SekCycleCnt+=m68k_execute(1);\r
+#elif defined(EMU_F68K)\r
+ SekCycleCnt+=fm68k_emulate(1, 0, 0);\r
+#endif\r
+}\r
\r
PICO_INTERNAL void SekSetRealTAS(int use_real)\r
{\r
#endif\r
}\r
\r
+\r
/* idle loop detection, not to be used in CD mode */\r
#ifdef EMU_C68K\r
#include "cpu/Cyclone/tools/idle.h"\r
static int idledet_count = 0, idledet_bads = 0;\r
int idledet_start_frame = 0;\r
\r
-static unsigned char *rom_verify = NULL;\r
+#if 0\r
+#define IDLE_STATS 1\r
+unsigned int idlehit_addrs[128], idlehit_counts[128];\r
+\r
+void SekRegisterIdleHit(unsigned int pc)\r
+{\r
+ int i;\r
+ for (i = 0; i < 127 && idlehit_addrs[i]; i++) {\r
+ if (idlehit_addrs[i] == pc) {\r
+ idlehit_counts[i]++;\r
+ return;\r
+ }\r
+ }\r
+ idlehit_addrs[i] = pc;\r
+ idlehit_counts[i] = 1;\r
+ idlehit_addrs[i+1] = 0;\r
+}\r
+#endif\r
\r
void SekInitIdleDet(void)\r
{\r
idledet_addrs = tmp;\r
idledet_count = idledet_bads = 0;\r
idledet_start_frame = Pico.m.frame_count + 360;\r
+#ifdef IDLE_STATS\r
+ idlehit_addrs[0] = 0;\r
+#endif\r
\r
- rom_verify = realloc(rom_verify, Pico.romsize);\r
- memcpy(rom_verify, Pico.rom, Pico.romsize);\r
#ifdef EMU_C68K\r
CycloneInitIdle();\r
#endif\r
+#ifdef EMU_F68K\r
+ fm68k_emulate(0, 0, 1);\r
+#endif\r
}\r
\r
int SekIsIdleCode(unsigned short *dst, int bytes)\r
{\r
- printf("SekIsIdleCode %04x %i\n", *dst, bytes);\r
+ // printf("SekIsIdleCode %04x %i\n", *dst, bytes);\r
switch (bytes)\r
{\r
+ case 2:\r
+ if ((*dst & 0xf000) != 0x6000) // not another branch\r
+ return 1;\r
+ break;\r
case 4:\r
if ( (*dst & 0xfff8) == 0x4a10 || // tst.b ($aX) // there should be no need to wait\r
(*dst & 0xfff8) == 0x4a28 || // tst.b ($xxxx,a0) // for byte change anywhere\r
return 0;\r
}\r
\r
-int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop)\r
+int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop, void *ctx)\r
{\r
-#ifdef EMU_C68K\r
- pc -= PicoCpuCM68k.membase;\r
+ int is_main68k = 1;\r
+#if defined(EMU_C68K)\r
+ struct Cyclone *cyc = ctx;\r
+ is_main68k = cyc == &PicoCpuCM68k;\r
+ pc -= cyc->membase;\r
+#elif defined(EMU_F68K)\r
+ is_main68k = ctx == &PicoCpuFM68k;\r
#endif\r
pc &= ~0xff000000;\r
- elprintf(EL_IDLE, "idle: patch %06x %04x %04x #%i", pc, oldop, newop, idledet_count);\r
+ elprintf(EL_IDLE, "idle: patch %06x %04x %04x %c %c #%i", pc, oldop, newop,\r
+ (newop&0x200)?'n':'y', is_main68k?'m':'s', idledet_count);\r
+\r
if (pc > Pico.romsize && !(PicoAHW & PAHW_SVP)) {\r
if (++idledet_bads > 128) return 2; // remove detector\r
return 1; // don't patch\r
\r
void SekFinishIdleDet(void)\r
{\r
- int done_something = idledet_count > 0;\r
#ifdef EMU_C68K\r
CycloneFinishIdle();\r
+#endif\r
+#ifdef EMU_F68K\r
+ fm68k_emulate(0, 0, 2);\r
#endif\r
while (idledet_count > 0)\r
{\r
else\r
elprintf(EL_STATUS|EL_IDLE, "idle: don't know how to restore %04x", *op);\r
}\r
-\r
- if (done_something)\r
- {\r
- int i;\r
- for (i = 0; i < Pico.romsize; i++)\r
- if (rom_verify[i] != Pico.rom[i])\r
- printf("ROM corruption @ %06x!\n", i), exit(1);\r
- }\r
}\r
\r
\r