famec: split fm68k_emulate

[picodrive.git] / pico / sek.c

diff --git a/pico/sek.c b/pico/sek.c
index 8dd7729..c76a3e8 100644 (file)
--- a/pico/sek.c
+++ b/pico/sek.c
@@ -10,11 +10,6 @@
 #include "pico_int.h"\r
 #include "memory.h"\r
 \r
-\r
-unsigned int SekCycleCnt;\r
-unsigned int SekCycleAim;\r
-\r
-\r
 /* context */\r
 // Cyclone 68000\r
 #ifdef EMU_C68K\r
@@ -30,15 +25,30 @@ M68K_CONTEXT PicoCpuFM68k;
 #endif\r
 \r
 \r
+static int do_ack(int level)\r
+{\r
+  struct PicoVideo *pv = &Pico.video;\r
+\r
+  elprintf(EL_INTS, "%cack: @ %06x [%u], p=%02x",\r
+    level == 6 ? 'v' : 'h', SekPc, SekCyclesDone(), pv->pending_ints);\r
+  // the VDP doesn't look at the 68k level\r
+  if (pv->pending_ints & pv->reg[1] & 0x20) {\r
+    pv->pending_ints &= ~0x20;\r
+    pv->status &= ~SR_F;\r
+    return (pv->reg[0] & pv->pending_ints & 0x10) >> 2;\r
+  }\r
+  else if (pv->pending_ints & pv->reg[0] & 0x10)\r
+    pv->pending_ints &= ~0x10;\r
+\r
+  return 0;\r
+}\r
+\r
 /* callbacks */\r
 #ifdef EMU_C68K\r
 // interrupt acknowledgment\r
 static int SekIntAck(int level)\r
 {\r
-  // try to emulate VDP's reaction to 68000 int ack\r
-  if     (level == 4) { Pico.video.pending_ints  =  0;    elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCycleCnt); }\r
-  else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCycleCnt); }\r
-  PicoCpuCM68k.irq = 0;\r
+  PicoCpuCM68k.irq = do_ack(level);\r
   return CYCLONE_INT_ACK_AUTOVECTOR;\r
 }\r
 \r
@@ -60,6 +70,8 @@ static int SekUnrecognizedOpcode()
     PicoCpuCM68k.state_flags |= 1;\r
     return 1;\r
   }\r
+  // happened once - may happen again\r
+  SekFinishIdleDet();\r
 #ifdef EMU_M68K // debugging cyclone\r
   {\r
     extern int have_illegal;\r
@@ -74,9 +86,7 @@ static int SekUnrecognizedOpcode()
 #ifdef EMU_M68K\r
 static int SekIntAckM68K(int level)\r
 {\r
-  if     (level == 4) { Pico.video.pending_ints  =  0;    elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCycleCnt); }\r
-  else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCycleCnt); }\r
-  CPU_INT_LEVEL = 0;\r
+  CPU_INT_LEVEL = do_ack(level) << 8;\r
   return M68K_INT_ACK_AUTOVECTOR;\r
 }\r
 \r
@@ -90,9 +100,7 @@ static int SekTasCallback(void)
 #ifdef EMU_F68K\r
 static void SekIntAckF68K(unsigned level)\r
 {\r
-  if     (level == 4) { Pico.video.pending_ints  =  0;    elprintf(EL_INTS, "hack: @ %06x [%i]", SekPc, SekCycleCnt); }\r
-  else if(level == 6) { Pico.video.pending_ints &= ~0x20; elprintf(EL_INTS, "vack: @ %06x [%i]", SekPc, SekCycleCnt); }\r
-  PicoCpuFM68k.interrupts[0] = 0;\r
+  PicoCpuFM68k.interrupts[0] = do_ack(level);\r
 }\r
 #endif\r
 \r
@@ -149,10 +157,7 @@ PICO_INTERNAL int SekReset(void)
   REG_USP = 0; // ?\r
 #endif\r
 #ifdef EMU_F68K\r
-  {\r
-    g_m68kcontext = &PicoCpuFM68k;\r
-    fm68k_reset();\r
-  }\r
+  fm68k_reset(&PicoCpuFM68k);\r
 #endif\r
 \r
   return 0;\r
@@ -160,17 +165,17 @@ PICO_INTERNAL int SekReset(void)
 \r
 void SekStepM68k(void)\r
 {\r
-  SekCycleAim=SekCycleCnt+1;\r
+  Pico.t.m68c_aim = Pico.t.m68c_cnt + 1;\r
 #if defined(EMU_CORE_DEBUG)\r
-  SekCycleCnt+=CM_compareRun(1, 0);\r
+  Pico.t.m68c_cnt += CM_compareRun(1, 0);\r
 #elif defined(EMU_C68K)\r
   PicoCpuCM68k.cycles=1;\r
   CycloneRun(&PicoCpuCM68k);\r
-  SekCycleCnt+=1-PicoCpuCM68k.cycles;\r
+  Pico.t.m68c_cnt += 1 - PicoCpuCM68k.cycles;\r
 #elif defined(EMU_M68K)\r
-  SekCycleCnt+=m68k_execute(1);\r
+  Pico.t.m68c_cnt += m68k_execute(1);\r
 #elif defined(EMU_F68K)\r
-  SekCycleCnt+=fm68k_emulate(1, 0, 0);\r
+  Pico.t.m68c_cnt += fm68k_emulate(&PicoCpuFM68k, 1, 0);\r
 #endif\r
 }\r
 \r
@@ -220,7 +225,7 @@ PICO_INTERNAL void SekPackCpu(unsigned char *cpu, int is_sub)
 \r
   *(unsigned int *)(cpu+0x40) = pc;\r
   *(unsigned int *)(cpu+0x50) =\r
-    is_sub ? SekCycleCntS68k : SekCycleCnt;\r
+    is_sub ? SekCycleCntS68k : Pico.t.m68c_cnt;\r
 }\r
 \r
 PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub)\r
@@ -260,7 +265,7 @@ PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub)
   if (is_sub)\r
     SekCycleCntS68k = *(unsigned int *)(cpu+0x50);\r
   else\r
-    SekCycleCnt = *(unsigned int *)(cpu+0x50);\r
+    Pico.t.m68c_cnt = *(unsigned int *)(cpu+0x50);\r
 }\r
 \r
 \r
@@ -294,7 +299,8 @@ void SekRegisterIdleHit(unsigned int pc)
 \r
 void SekInitIdleDet(void)\r
 {\r
-  unsigned short **tmp = realloc(idledet_ptrs, 0x200*4);\r
+  unsigned short **tmp;\r
+  tmp = realloc(idledet_ptrs, 0x200 * sizeof(tmp[0]));\r
   if (tmp == NULL) {\r
     free(idledet_ptrs);\r
     idledet_ptrs = NULL;\r
@@ -311,7 +317,7 @@ void SekInitIdleDet(void)
   CycloneInitIdle();\r
 #endif\r
 #ifdef EMU_F68K\r
-  fm68k_emulate(0, 0, 1);\r
+  fm68k_idle_install();\r
 #endif\r
 }\r
 \r
@@ -402,7 +408,8 @@ int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop, void *ctx)
   }\r
 \r
   if (idledet_count >= 0x200 && (idledet_count & 0x1ff) == 0) {\r
-    unsigned short **tmp = realloc(idledet_ptrs, (idledet_count+0x200)*4);\r
+    unsigned short **tmp;\r
+    tmp = realloc(idledet_ptrs, (idledet_count+0x200) * sizeof(tmp[0]));\r
     if (tmp == NULL)\r
       return 1;\r
     idledet_ptrs = tmp;\r
@@ -415,11 +422,13 @@ int SekRegisterIdlePatch(unsigned int pc, int oldop, int newop, void *ctx)
 \r
 void SekFinishIdleDet(void)\r
 {\r
+  if (idledet_count < 0)\r
+    return;\r
 #ifdef EMU_C68K\r
   CycloneFinishIdle();\r
 #endif\r
 #ifdef EMU_F68K\r
-  fm68k_emulate(0, 0, 2);\r
+  fm68k_idle_remove();\r
 #endif\r
   while (idledet_count > 0)\r
   {\r
@@ -433,6 +442,7 @@ void SekFinishIdleDet(void)
     else\r
       elprintf(EL_STATUS|EL_IDLE, "idle: don't know how to restore %04x", *op);\r
   }\r
+  idledet_count = -1;\r
 }\r
 \r
 \r
@@ -454,7 +464,7 @@ void SekTrace(int is_s68k)
   struct ref_68k *x68k = &ref_68ks[is_s68k];\r
   u32 pc = is_s68k ? SekPcS68k : SekPc;\r
   u32 sr = is_s68k ? SekSrS68k : SekSr;\r
-  u32 cycles = is_s68k ? SekCycleCntS68k : SekCycleCnt;\r
+  u32 cycles = is_s68k ? SekCycleCntS68k : Pico.t.m68c_cnt;\r
   u32 r;\r
   u8 cmd;\r
 #ifdef CPU_CMP_W\r
@@ -543,6 +553,7 @@ breakloop:
                        printf("D%d: %08x  A%d: %08x\n", i, x68k->dar[i],\r
         i, x68k->dar[i + 8]);\r
                printf("PC: %08x, %08x\n", x68k->pc, x68k->pc_prev);\r
+               printf("SR: %04x\n", x68k->sr);\r
 \r
     PDebugDumpMem();\r
     exit(1);\r