X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FSek.c;h=001faeace10e6c9cfd0cbd5be50b586d31b7b209;hb=053fd9b42f2cf38194f78e37c373363fc9cb9933;hp=449a4d7a59d62d96844f0db9d560cc6011da9c90;hpb=3aa1e148a28da9b4e10e824984f7b3a4908b1ace;p=picodrive.git

diff --git a/Pico/Sek.c b/Pico/Sek.c
index 449a4d7..001faea 100644
--- a/Pico/Sek.c
+++ b/Pico/Sek.c
@@ -104,6 +104,7 @@ PICO_INTERNAL int SekInit()
   PicoCpuCM68k.IrqCallback=SekIntAck;
   PicoCpuCM68k.ResetCallback=SekResetAck;
   PicoCpuCM68k.UnrecognizedCallback=SekUnrecognizedOpcode;
+  PicoCpuCM68k.flags=4;   // Z set
 #endif
 #ifdef EMU_M68K
   {
@@ -113,7 +114,7 @@ PICO_INTERNAL int SekInit()
     m68k_init();
     m68k_set_int_ack_callback(SekIntAckM68K);
     m68k_set_tas_instr_callback(SekTasCallback);
-    m68k_pulse_reset(); // Init cpu emulator
+    //m68k_pulse_reset();
     m68k_set_context(oldcontext);
   }
 #endif
@@ -122,8 +123,9 @@ PICO_INTERNAL int SekInit()
     void *oldcontext = g_m68kcontext;
     g_m68kcontext = &PicoCpuFM68k;
     memset(&PicoCpuFM68k, 0, sizeof(PicoCpuFM68k));
-    m68k_init();
+    fm68k_init();
     PicoCpuFM68k.iack_handler = SekIntAckF68K;
+    PicoCpuFM68k.sr = 0x2704; // Z flag
     g_m68kcontext = oldcontext;
   }
 #endif
@@ -141,7 +143,6 @@ PICO_INTERNAL int SekReset()
   PicoCpuCM68k.state_flags=0;
   PicoCpuCM68k.osp=0;
   PicoCpuCM68k.srh =0x27; // Supervisor mode
-  PicoCpuCM68k.flags=4;   // Z set
   PicoCpuCM68k.irq=0;
   PicoCpuCM68k.a[7]=PicoCpuCM68k.read32(0); // Stack Pointer
   PicoCpuCM68k.membase=0;
@@ -152,11 +153,12 @@ PICO_INTERNAL int SekReset()
   m68ki_cpu.sp[0]=0;
   m68k_set_irq(0);
   m68k_pulse_reset();
+  REG_USP = 0; // ?
 #endif
 #ifdef EMU_F68K
   {
     g_m68kcontext = &PicoCpuFM68k;
-    m68k_reset();
+    fm68k_reset();
   }
 #endif
 
@@ -164,44 +166,20 @@ PICO_INTERNAL int SekReset()
 }
 
 
-PICO_INTERNAL int SekInterrupt(int irq)
-{
-#if defined(EMU_C68K) && defined(EMU_M68K)
-  {
-    extern unsigned int dbg_irq_level;
-    dbg_irq_level=irq;
-    return 0;
-  }
-#endif
-#ifdef EMU_C68K
-  PicoCpuCM68k.irq=irq;
-#endif
-#ifdef EMU_M68K
-  {
-    void *oldcontext = m68ki_cpu_p;
-    m68k_set_context(&PicoCpuMM68k);
-    m68k_set_irq(irq); // raise irq (gets lowered after taken or must be done in ack)
-    m68k_set_context(oldcontext);
-  }
-#endif
-#ifdef EMU_F68K
-  PicoCpuFM68k.interrupts[0]=irq;
-#endif
-
-  return 0;
-}
-
 // data must be word aligned
 PICO_INTERNAL void SekState(int *data)
 {
 #ifdef EMU_C68K
-  memcpy32(data,PicoCpuCM68k.d,0x44/4);
+  memcpy32(data,(int *)PicoCpuCM68k.d,0x44/4);
+  data[0x11] = PicoCpuCM68k.flags;
 #elif defined(EMU_M68K)
-  memcpy32(data, PicoCpuMM68k.dar, 0x40/4);
+  memcpy32(data, (int *)PicoCpuMM68k.dar, 0x40/4);
   data[0x10] = PicoCpuMM68k.pc;
+  data[0x11] = m68k_get_reg(&PicoCpuMM68k, M68K_REG_SR);
 #elif defined(EMU_F68K)
   memcpy32(data, (int *)PicoCpuFM68k.dreg, 0x40/4);
   data[0x10] = PicoCpuFM68k.pc;
+  data[0x11] = PicoCpuFM68k.sr;
 #endif
 }
 
@@ -215,3 +193,155 @@ PICO_INTERNAL void SekSetRealTAS(int use_real)
 #endif
 }
 
+/* idle loop detection, not to be used in CD mode */
+#ifdef EMU_C68K
+#include "cpu/Cyclone/tools/idle.h"
+#endif
+
+static int *idledet_addrs = NULL;
+static int idledet_count = 0, idledet_bads = 0;
+int idledet_start_frame = 0;
+
+static int jump_verify[0x10000];
+extern int CycloneJumpTab[];
+static unsigned char *rom_verify = NULL;
+
+void SekInitIdleDet(void)
+{
+  void *tmp = realloc(idledet_addrs, 0x200*4);
+  if (tmp == NULL) {
+    free(idledet_addrs);
+    idledet_addrs = NULL;
+  }
+  else
+    idledet_addrs = tmp;
+  idledet_count = idledet_bads = 0;
+  idledet_start_frame = Pico.m.frame_count + 360;
+
+  memcpy(jump_verify, CycloneJumpTab, 0x10000*4);
+  rom_verify = realloc(rom_verify, Pico.romsize);
+  memcpy(rom_verify, Pico.rom, Pico.romsize);
+#ifdef EMU_C68K
+  CycloneInitIdle();
+#endif
+}
+
+int SekIsIdleCode(unsigned short *dst, int bytes)
+{
+  printf("SekIsIdleCode %04x %i\n", *dst, bytes);
+  switch (bytes)
+  {
+    case 4:
+      if (  (*dst & 0xfff8) == 0x4a10 || // tst.b ($aX)      // where should be no need to wait
+	    (*dst & 0xfff8) == 0x4a28 || // tst.b ($xxxx,a0) // for byte change anywhere
+            (*dst & 0xff3f) == 0x4a38 || // tst.x ($xxxx.w), tas ($xxxx.w)
+            (*dst & 0xc1ff) == 0x0038 || // move.x ($xxxx.w), dX
+            (*dst & 0xf13f) == 0xb038)   // cmp.x ($xxxx.w), dX
+        return 1;
+      break;
+    case 6:
+      if ( ((dst[1] & 0xe0) == 0xe0 && ( // RAM
+            *dst == 0x4a39 ||            // tst.b ($xxxxxxxx)
+            *dst == 0x4a79 ||            // tst.w ($xxxxxxxx)
+            *dst == 0x4ab9)) ||          // tst.l ($xxxxxxxx)
+	    *dst == 0x0838)              // btst $X, ($xxxx.w) [6 byte op]
+        return 1;
+      break;
+    case 8:
+      if ( (dst[2] & 0xe0) == 0xe0 && (  // RAM
+	    *dst == 0x0839 ||            // btst $X, ($xxxxxxxx.w) [8 byte op]
+            (*dst & 0xffbf) == 0x0c39))  // cmpi.{b,w} $X, ($xxxxxxxx)
+        return 1;
+      break;
+    case 12:
+       if ((*dst & 0xf1f8) == 0x3010 && // move.w (aX), dX
+	    (dst[1]&0xf100) == 0x0000 && // arithmetic
+	    (dst[3]&0xf100) == 0x0000)   // arithmetic
+        return 1;
+      break;
+  }
+
+  return 0;
+}
+
+int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop)
+{
+#ifdef EMU_C68K
+  pc -= PicoCpuCM68k.membase;
+#endif
+  pc &= ~0xff000000;
+  elprintf(EL_IDLE, "idle: patch %06x %04x %04x #%i", pc, oldop, newop, idledet_count);
+  if (pc > Pico.romsize) {
+    if (++idledet_bads > 128) return 2; // remove detector
+    return 1; // don't patch
+  }
+
+  if (idledet_count >= 0x200 && (idledet_count & 0x1ff) == 0) {
+    void *tmp = realloc(idledet_addrs, (idledet_count+0x200)*4);
+    if (tmp == NULL) return 1;
+    idledet_addrs = tmp;
+  }
+
+  idledet_addrs[idledet_count++] = pc;
+  return 0;
+}
+
+void SekFinishIdleDet(void)
+{
+	int done_something = idledet_count > 0;
+#ifdef EMU_C68K
+  CycloneFinishIdle();
+#endif
+  while (idledet_count > 0)
+  {
+    unsigned short *op = (unsigned short *)&Pico.rom[idledet_addrs[--idledet_count]];
+    if      ((*op & 0xfd00) == 0x7100)
+      *op &= 0xff, *op |= 0x6600;
+    else if ((*op & 0xfd00) == 0x7500)
+      *op &= 0xff, *op |= 0x6700;
+    else if ((*op & 0xfd00) == 0x7d00)
+      *op &= 0xff, *op |= 0x6000;
+    else
+      elprintf(EL_STATUS|EL_IDLE, "idle: don't know how to restore %04x", *op);
+  }
+
+  if (done_something)
+  {
+    int i;
+    for (i = 0; i < 0x10000; i++)
+      if (jump_verify[i] != CycloneJumpTab[i])
+        printf("jumptab corruption @ %04x!\n", i), exit(1);
+    for (i = 0; i < Pico.romsize; i++)
+      if (rom_verify[i] != Pico.rom[i])
+        printf("ROM corruption @ %06x!\n", i), exit(1);
+  }
+}
+
+
+#if defined(EMU_M68K) && M68K_INSTRUCTION_HOOK == OPT_SPECIFY_HANDLER
+static unsigned char op_flags[0x400000/2] = { 0, };
+static int atexit_set = 0;
+
+static void make_idc(void)
+{
+  FILE *f = fopen("idc.idc", "w");
+  int i;
+  if (!f) return;
+  fprintf(f, "#include <idc.idc>\nstatic main() {\n");
+  for (i = 0; i < 0x400000/2; i++)
+    if (op_flags[i] != 0)
+      fprintf(f, "  MakeCode(0x%06x);\n", i*2);
+  fprintf(f, "}\n");
+  fclose(f);
+}
+
+void instruction_hook(void)
+{
+  if (!atexit_set) {
+    atexit(make_idc);
+    atexit_set = 1;
+  }
+  if (REG_PC < 0x400000)
+    op_flags[REG_PC/2] = 1;
+}
+#endif