X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FSek.c;h=b03dd702398ef6aa9a626c73089e09035324af07;hb=c060a9ab9c428e1ed9c4159b56529a2a36031e44;hp=ddce5580fbc83270bb51023d6fdf0b0906cca90b;hpb=03e4f2a349247334666c87abe3a908df72d23051;p=picodrive.git

diff --git a/Pico/Sek.c b/Pico/Sek.c
index ddce558..b03dd70 100644
--- a/Pico/Sek.c
+++ b/Pico/Sek.c
@@ -96,7 +96,7 @@ static void SekIntAckF68K(unsigned level)
 #endif
 
 
-PICO_INTERNAL int SekInit()
+PICO_INTERNAL void SekInit(void)
 {
 #ifdef EMU_C68K
   CycloneInit();
@@ -114,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
@@ -125,16 +125,15 @@ PICO_INTERNAL int SekInit()
     memset(&PicoCpuFM68k, 0, sizeof(PicoCpuFM68k));
     fm68k_init();
     PicoCpuFM68k.iack_handler = SekIntAckF68K;
+    PicoCpuFM68k.sr = 0x2704; // Z flag
     g_m68kcontext = oldcontext;
   }
 #endif
-
-  return 0;
 }
 
 
 // Reset the 68000:
-PICO_INTERNAL int SekReset()
+PICO_INTERNAL int SekReset(void)
 {
   if (Pico.rom==NULL) return 1;
 
@@ -152,6 +151,7 @@ PICO_INTERNAL int SekReset()
   m68ki_cpu.sp[0]=0;
   m68k_set_irq(0);
   m68k_pulse_reset();
+  REG_USP = 0; // ?
 #endif
 #ifdef EMU_F68K
   {
@@ -164,54 +164,178 @@ PICO_INTERNAL int SekReset()
 }
 
 
-PICO_INTERNAL int SekInterrupt(int irq)
+PICO_INTERNAL void SekSetRealTAS(int use_real)
 {
-#ifdef EMU_CORE_DEBUG
-  {
-    extern unsigned int dbg_irq_level;
-    dbg_irq_level=irq;
-    return 0;
-  }
+#ifdef EMU_C68K
+  CycloneSetRealTAS(use_real);
 #endif
+#ifdef EMU_F68K
+  // TODO
+#endif
+}
+
+/* idle loop detection, not to be used in CD mode */
 #ifdef EMU_C68K
-  PicoCpuCM68k.irq=irq;
+#include "cpu/Cyclone/tools/idle.h"
 #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);
+
+static int *idledet_addrs = NULL;
+static int idledet_count = 0, idledet_bads = 0;
+int idledet_start_frame = 0;
+int jumptab[0x10000];
+
+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;
+
+  rom_verify = realloc(rom_verify, Pico.romsize);
+  memcpy(rom_verify, Pico.rom, Pico.romsize);
+#ifdef EMU_C68K
+  CycloneInitIdle();
 #endif
 #ifdef EMU_F68K
-  PicoCpuFM68k.interrupts[0]=irq;
+  { extern void *get_jumptab(void);  memcpy(jumptab, get_jumptab(), sizeof(jumptab)); }
+  fm68k_emulate(0, 0, 1);
 #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)      // there 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 and
+            *dst == 0x4a39 ||            //   tst.b ($xxxxxxxx)
+            *dst == 0x4a79 ||            //   tst.w ($xxxxxxxx)
+            *dst == 0x4ab9 ||            //   tst.l ($xxxxxxxx)
+            (*dst & 0xc1ff) == 0x0039 || //   move.x ($xxxxxxxx), dX
+            (*dst & 0xf13f) == 0xb039))||//   cmp.x ($xxxxxxxx), dX
+            *dst == 0x0838 ||            // btst $X, ($xxxx.w) [6 byte op]
+            (*dst & 0xffbf) == 0x0c38)   // cmpi.{b,w} $X, ($xxxx.w)
+        return 1;
+      break;
+    case 8:
+      if ( ((dst[2] & 0xe0) == 0xe0 && ( // RAM and
+            *dst == 0x0839 ||            //   btst $X, ($xxxxxxxx.w) [8 byte op]
+            (*dst & 0xffbf) == 0x0c39))||//   cmpi.{b,w} $X, ($xxxxxxxx)
+            *dst == 0x0cb8)              // cmpi.l $X, ($xxxx.w)
+        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;
 }
 
-// data must be word aligned
-PICO_INTERNAL void SekState(int *data)
+int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop)
 {
 #ifdef EMU_C68K
-  memcpy32(data,(int *)PicoCpuCM68k.d,0x44/4);
-#elif defined(EMU_M68K)
-  memcpy32(data, (int *)PicoCpuMM68k.dar, 0x40/4);
-  data[0x10] = PicoCpuMM68k.pc;
-#elif defined(EMU_F68K)
-  memcpy32(data, (int *)PicoCpuFM68k.dreg, 0x40/4);
-  data[0x10] = PicoCpuFM68k.pc;
+  pc -= PicoCpuCM68k.membase;
 #endif
+  pc &= ~0xff000000;
+  elprintf(EL_IDLE, "idle: patch %06x %04x %04x #%i", pc, oldop, newop, idledet_count);
+  if (pc > Pico.romsize && !(PicoAHW & PAHW_SVP)) {
+    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;
+  }
+
+  if (pc < Pico.romsize)
+    idledet_addrs[idledet_count++] = pc;
+
+  return 0;
 }
 
-PICO_INTERNAL void SekSetRealTAS(int use_real)
+void SekFinishIdleDet(void)
 {
+	int done_something = idledet_count > 0;
 #ifdef EMU_C68K
-  CycloneSetRealTAS(use_real);
+  CycloneFinishIdle();
 #endif
 #ifdef EMU_F68K
-  // TODO
+  fm68k_emulate(0, 0, 2);
 #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, *jt;
+   extern void *get_jumptab(void);
+    for (i = 0; i < Pico.romsize; i++)
+      if (rom_verify[i] != Pico.rom[i])
+        printf("ROM corruption @ %06x!\n", i), exit(1);
+
+    jt = get_jumptab();
+    for (i = 0; i < 0x10000; i++)
+      if (jumptab[i] != jt[i]) { printf("jumptab broken @ %04x\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