X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fsek.c;h=84c048e31eaf9e45fae27d885a57502b03da823d;hb=fda2f31020bf0d6cf7b5dd70ec01cf390b7e1483;hp=2fe77cbb7496d17674c2b99fe07147001917a2ad;hpb=12da51c27a8d1c1205d8f0f01bbc4814c46e79ce;p=picodrive.git

diff --git a/pico/sek.c b/pico/sek.c
index 2fe77cb..84c048e 100644
--- a/pico/sek.c
+++ b/pico/sek.c
@@ -10,12 +10,6 @@
 #include "pico_int.h"
 #include "memory.h"
 
-
-int SekCycleCnt=0; // cycles done in this frame
-int SekCycleAim=0; // cycle aim
-unsigned int SekCycleCntT=0;
-
-
 /* context */
 // Cyclone 68000
 #ifdef EMU_C68K
@@ -31,15 +25,30 @@ M68K_CONTEXT PicoCpuFM68k;
 #endif
 
 
+static int do_ack(int level)
+{
+  struct PicoVideo *pv = &Pico.video;
+
+  elprintf(EL_INTS, "%cack: @ %06x [%u], p=%02x",
+    level == 6 ? 'v' : 'h', SekPc, SekCyclesDone(), pv->pending_ints);
+  // the VDP doesn't look at the 68k level
+  if (pv->pending_ints & pv->reg[1] & 0x20) {
+    pv->pending_ints &= ~0x20;
+    pv->status &= ~SR_F;
+    return (pv->reg[0] & pv->pending_ints & 0x10) >> 2;
+  }
+  else if (pv->pending_ints & pv->reg[0] & 0x10)
+    pv->pending_ints &= ~0x10;
+
+  return 0;
+}
+
 /* callbacks */
 #ifdef EMU_C68K
 // interrupt acknowledgment
 static int SekIntAck(int level)
 {
-  // try to emulate VDP's reaction to 68000 int ack
-  if     (level == 4) { Pico.video.pending_ints  =  0;    elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCycleCnt); }
-  else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCycleCnt); }
-  PicoCpuCM68k.irq = 0;
+  PicoCpuCM68k.irq = do_ack(level);
   return CYCLONE_INT_ACK_AUTOVECTOR;
 }
 
@@ -61,6 +70,8 @@ static int SekUnrecognizedOpcode()
     PicoCpuCM68k.state_flags |= 1;
     return 1;
   }
+  // happened once - may happen again
+  SekFinishIdleDet();
 #ifdef EMU_M68K // debugging cyclone
   {
     extern int have_illegal;
@@ -75,9 +86,7 @@ static int SekUnrecognizedOpcode()
 #ifdef EMU_M68K
 static int SekIntAckM68K(int level)
 {
-  if     (level == 4) { Pico.video.pending_ints  =  0;    elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCycleCnt); }
-  else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCycleCnt); }
-  CPU_INT_LEVEL = 0;
+  CPU_INT_LEVEL = do_ack(level) << 8;
   return M68K_INT_ACK_AUTOVECTOR;
 }
 
@@ -91,9 +100,7 @@ static int SekTasCallback(void)
 #ifdef EMU_F68K
 static void SekIntAckF68K(unsigned level)
 {
-  if     (level == 4) { Pico.video.pending_ints  =  0;    elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCycleCnt); }
-  else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCycleCnt); }
-  PicoCpuFM68k.interrupts[0] = 0;
+  PicoCpuFM68k.interrupts[0] = do_ack(level);
 }
 #endif
 
@@ -121,15 +128,10 @@ PICO_INTERNAL void SekInit(void)
   }
 #endif
 #ifdef EMU_F68K
-  {
-    void *oldcontext = g_m68kcontext;
-    g_m68kcontext = &PicoCpuFM68k;
-    memset(&PicoCpuFM68k, 0, sizeof(PicoCpuFM68k));
-    fm68k_init();
-    PicoCpuFM68k.iack_handler = SekIntAckF68K;
-    PicoCpuFM68k.sr = 0x2704; // Z flag
-    g_m68kcontext = oldcontext;
-  }
+  memset(&PicoCpuFM68k, 0, sizeof(PicoCpuFM68k));
+  fm68k_init();
+  PicoCpuFM68k.iack_handler = SekIntAckF68K;
+  PicoCpuFM68k.sr = 0x2704; // Z flag
 #endif
 }
 
@@ -150,10 +152,7 @@ PICO_INTERNAL int SekReset(void)
   REG_USP = 0; // ?
 #endif
 #ifdef EMU_F68K
-  {
-    g_m68kcontext = &PicoCpuFM68k;
-    fm68k_reset();
-  }
+  fm68k_reset(&PicoCpuFM68k);
 #endif
 
   return 0;
@@ -161,17 +160,17 @@ PICO_INTERNAL int SekReset(void)
 
 void SekStepM68k(void)
 {
-  SekCycleAim=SekCycleCnt+1;
+  Pico.t.m68c_aim = Pico.t.m68c_cnt + 1;
 #if defined(EMU_CORE_DEBUG)
-  SekCycleCnt+=CM_compareRun(1, 0);
+  Pico.t.m68c_cnt += CM_compareRun(1, 0);
 #elif defined(EMU_C68K)
   PicoCpuCM68k.cycles=1;
   CycloneRun(&PicoCpuCM68k);
-  SekCycleCnt+=1-PicoCpuCM68k.cycles;
+  Pico.t.m68c_cnt += 1 - PicoCpuCM68k.cycles;
 #elif defined(EMU_M68K)
-  SekCycleCnt+=m68k_execute(1);
+  Pico.t.m68c_cnt += m68k_execute(1);
 #elif defined(EMU_F68K)
-  SekCycleCnt+=fm68k_emulate(1, 0, 0);
+  Pico.t.m68c_cnt += fm68k_emulate(&PicoCpuFM68k, 1, 0);
 #endif
 }
 
@@ -220,7 +219,8 @@ PICO_INTERNAL void SekPackCpu(unsigned char *cpu, int is_sub)
 #endif
 
   *(unsigned int *)(cpu+0x40) = pc;
-  *(unsigned int *)(cpu+0x50) = SekCycleCntT;
+  *(unsigned int *)(cpu+0x50) =
+    is_sub ? SekCycleCntS68k : Pico.t.m68c_cnt;
 }
 
 PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub)
@@ -257,7 +257,10 @@ PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub)
   context->execinfo &= ~FM68K_HALTED;
   if (cpu[0x4d]&1) context->execinfo |= FM68K_HALTED;
 #endif
-  SekCycleCntT = *(unsigned int *)(cpu+0x50);
+  if (is_sub)
+    SekCycleCntS68k = *(unsigned int *)(cpu+0x50);
+  else
+    Pico.t.m68c_cnt = *(unsigned int *)(cpu+0x50);
 }
 
 
@@ -268,7 +271,7 @@ PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub)
 
 static unsigned short **idledet_ptrs = NULL;
 static int idledet_count = 0, idledet_bads = 0;
-int idledet_start_frame = 0;
+static int idledet_start_frame = 0;
 
 #if 0
 #define IDLE_STATS 1
@@ -291,7 +294,8 @@ void SekRegisterIdleHit(unsigned int pc)
 
 void SekInitIdleDet(void)
 {
-  unsigned short **tmp = realloc(idledet_ptrs, 0x200*4);
+  unsigned short **tmp;
+  tmp = realloc(idledet_ptrs, 0x200 * sizeof(tmp[0]));
   if (tmp == NULL) {
     free(idledet_ptrs);
     idledet_ptrs = NULL;
@@ -308,10 +312,15 @@ void SekInitIdleDet(void)
   CycloneInitIdle();
 #endif
 #ifdef EMU_F68K
-  fm68k_emulate(0, 0, 1);
+  fm68k_idle_install();
 #endif
 }
 
+int SekIsIdleReady(void)
+{
+	return (Pico.m.frame_count >= idledet_start_frame);
+}
+
 int SekIsIdleCode(unsigned short *dst, int bytes)
 {
   // printf("SekIsIdleCode %04x %i\n", *dst, bytes);
@@ -322,11 +331,16 @@ int SekIsIdleCode(unsigned short *dst, int bytes)
         return 1;
       break;
     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
+      if ( (*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;
+      if (PicoIn.AHW & (PAHW_MCD|PAHW_32X))
+        break;
+      // with no addons, there should be no need to wait
+      // for byte change anywhere
+      if ( (*dst & 0xfff8) == 0x4a10 || // tst.b ($aX)
+           (*dst & 0xfff8) == 0x4a28)   // tst.b ($xxxx,a0)
         return 1;
       break;
     case 6:
@@ -348,7 +362,9 @@ int SekIsIdleCode(unsigned short *dst, int bytes)
         return 1;
       break;
     case 12:
-       if ((*dst & 0xf1f8) == 0x3010 && // move.w (aX), dX
+      if (PicoIn.AHW & (PAHW_MCD|PAHW_32X))
+        break;
+      if ( (*dst & 0xf1f8) == 0x3010 && // move.w (aX), dX
             (dst[1]&0xf100) == 0x0000 && // arithmetic
             (dst[3]&0xf100) == 0x0000)   // arithmetic
         return 1;
@@ -372,6 +388,7 @@ int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop, void *ctx)
   is_main68k = ctx == &PicoCpuFM68k;
 #endif
   pc &= ~0xff000000;
+  if (!(newop&0x200))
   elprintf(EL_IDLE, "idle: patch %06x %04x %04x %c %c #%i", pc, oldop, newop,
     (newop&0x200)?'n':'y', is_main68k?'m':'s', idledet_count);
 
@@ -386,7 +403,8 @@ int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop, void *ctx)
   }
 
   if (idledet_count >= 0x200 && (idledet_count & 0x1ff) == 0) {
-    unsigned short **tmp = realloc(idledet_ptrs, (idledet_count+0x200)*4);
+    unsigned short **tmp;
+    tmp = realloc(idledet_ptrs, (idledet_count+0x200) * sizeof(tmp[0]));
     if (tmp == NULL)
       return 1;
     idledet_ptrs = tmp;
@@ -399,11 +417,13 @@ int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop, void *ctx)
 
 void SekFinishIdleDet(void)
 {
+  if (idledet_count < 0)
+    return;
 #ifdef EMU_C68K
   CycloneFinishIdle();
 #endif
 #ifdef EMU_F68K
-  fm68k_emulate(0, 0, 2);
+  fm68k_idle_remove();
 #endif
   while (idledet_count > 0)
   {
@@ -417,6 +437,7 @@ void SekFinishIdleDet(void)
     else
       elprintf(EL_STATUS|EL_IDLE, "idle: don't know how to restore %04x", *op);
   }
+  idledet_count = -1;
 }
 
 
@@ -438,7 +459,7 @@ void SekTrace(int is_s68k)
   struct ref_68k *x68k = &ref_68ks[is_s68k];
   u32 pc = is_s68k ? SekPcS68k : SekPc;
   u32 sr = is_s68k ? SekSrS68k : SekSr;
-  u32 cycles = is_s68k ? SekCycleCntS68k : SekCycleCnt;
+  u32 cycles = is_s68k ? SekCycleCntS68k : Pico.t.m68c_cnt;
   u32 r;
   u8 cmd;
 #ifdef CPU_CMP_W
@@ -527,6 +548,7 @@ breakloop:
 			printf("D%d: %08x  A%d: %08x\n", i, x68k->dar[i],
         i, x68k->dar[i + 8]);
 		printf("PC: %08x, %08x\n", x68k->pc, x68k->pc_prev);
+		printf("SR: %04x\n", x68k->sr);
 
     PDebugDumpMem();
     exit(1);