idle loops adjusted

[picodrive.git] / Pico / Sek.c

diff --git a/Pico/Sek.c b/Pico/Sek.c
index 333169c..f72da65 100644 (file)
--- a/Pico/Sek.c
+++ b/Pico/Sek.c
@@ -199,6 +199,25 @@ static int *idledet_addrs = NULL;
 static int idledet_count = 0, idledet_bads = 0;\r
 int idledet_start_frame = 0;\r
 \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
   void *tmp = realloc(idledet_addrs, 0x200*4);\r
@@ -210,6 +229,9 @@ void SekInitIdleDet(void)
     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
 #ifdef EMU_C68K\r
   CycloneInitIdle();\r
@@ -224,6 +246,10 @@ int SekIsIdleCode(unsigned short *dst, int bytes)
   // 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
@@ -261,13 +287,20 @@ int SekIsIdleCode(unsigned short *dst, int bytes)
   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