SekStepM68k restored, pad read issues with D&D fixed

[picodrive.git] / Pico / Sek.c

diff --git a/Pico/Sek.c b/Pico/Sek.c
index b03dd70..73b7b7c 100644 (file)
--- a/Pico/Sek.c
+++ b/Pico/Sek.c
@@ -163,6 +163,21 @@ PICO_INTERNAL int SekReset(void)
   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);\r
+#endif\r
+}\r
 \r
 PICO_INTERNAL void SekSetRealTAS(int use_real)\r
 {\r
@@ -174,6 +189,7 @@ PICO_INTERNAL void SekSetRealTAS(int use_real)
 #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
@@ -182,9 +198,6 @@ PICO_INTERNAL void SekSetRealTAS(int use_real)
 static int *idledet_addrs = NULL;\r
 static int idledet_count = 0, idledet_bads = 0;\r
 int idledet_start_frame = 0;\r
-int jumptab[0x10000];\r
-\r
-static unsigned char *rom_verify = NULL;\r
 \r
 void SekInitIdleDet(void)\r
 {\r
@@ -198,20 +211,17 @@ void SekInitIdleDet(void)
   idledet_count = idledet_bads = 0;\r
   idledet_start_frame = Pico.m.frame_count + 360;\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
-  { extern void *get_jumptab(void);  memcpy(jumptab, get_jumptab(), sizeof(jumptab)); }\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 4:\r
@@ -277,7 +287,6 @@ int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop)
 \r
 void SekFinishIdleDet(void)\r
 {\r
-       int done_something = idledet_count > 0;\r
 #ifdef EMU_C68K\r
   CycloneFinishIdle();\r
 #endif\r
@@ -296,19 +305,6 @@ void SekFinishIdleDet(void)
     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, *jt;\r
-   extern void *get_jumptab(void);\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
-    jt = get_jumptab();\r
-    for (i = 0; i < 0x10000; i++)\r
-      if (jumptab[i] != jt[i]) { printf("jumptab broken @ %04x\n", i); exit(1); }\r
-  }\r
 }\r
 \r
 \r