new acc mode timing, VDP FIFO code

[picodrive.git] / Pico / Sek.c

diff --git a/Pico/Sek.c b/Pico/Sek.c
index e05f6f4..1f2316e 100644 (file)
--- a/Pico/Sek.c
+++ b/Pico/Sek.c
@@ -43,19 +43,18 @@ static int (*ResetCallback)()=DoReset;
 \r
 #ifdef EMU_C68K\r
 // interrupt acknowledgment\r
-static void SekIntAck(int level)\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;\r
-  else if(level == 6) Pico.video.pending_ints &= ~0x20;\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
   PicoCpu.irq = 0;\r
+  return CYCLONE_INT_ACK_AUTOVECTOR;\r
 }\r
 \r
-static void SekResetAck()\r
+static void SekResetAck(void)\r
 {\r
-#if defined(__DEBUG_PRINT) || defined(WIN32)\r
-  dprintf("Reset encountered @ %06x", SekPc);\r
-#endif\r
+  elprintf(EL_ANOMALY, "Reset encountered @ %06x", SekPc);\r
 }\r
 \r
 static int SekUnrecognizedOpcode()\r
@@ -63,15 +62,19 @@ static int SekUnrecognizedOpcode()
   unsigned int pc, op;\r
   pc = SekPc;\r
   op = PicoCpu.read16(pc);\r
-#if defined(__DEBUG_PRINT) || defined(WIN32)\r
-  dprintf("Unrecognized Opcode %04x @ %06x", op, pc);\r
-#endif\r
+  elprintf(EL_ANOMALY, "Unrecognized Opcode %04x @ %06x", op, pc);\r
   // see if we are not executing trash\r
   if (pc < 0x200 || (pc > Pico.romsize+4 && (pc&0xe00000)!=0xe00000)) {\r
     PicoCpu.cycles = 0;\r
-    PicoCpu.stopped = 1;\r
+    PicoCpu.state_flags |= 1;\r
     return 1;\r
   }\r
+#ifdef EMU_M68K // debugging cyclone\r
+  {\r
+    extern int have_illegal;\r
+    have_illegal = 1;\r
+  }\r
+#endif\r
   //exit(1);\r
   return 0;\r
 }\r
@@ -81,16 +84,21 @@ static int SekUnrecognizedOpcode()
 #ifdef EMU_M68K\r
 static int SekIntAckM68K(int level)\r
 {\r
-  if     (level == 4) { Pico.video.pending_ints  =  0;    dprintf("hack: [%i|%i]", Pico.m.scanline, SekCyclesDone()); }\r
-  else if(level == 6) { Pico.video.pending_ints &= ~0x20; dprintf("vack: [%i|%i]", Pico.m.scanline, SekCyclesDone()); }\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
   return M68K_INT_ACK_AUTOVECTOR;\r
 }\r
+\r
+static int SekTasCallback(void)\r
+{\r
+  return 0; // no writeback\r
+}\r
 #endif\r
 \r
 \r
 \r
-int SekInit()\r
+PICO_INTERNAL int SekInit()\r
 {\r
 #ifdef EMU_C68K\r
   CycloneInit();\r
@@ -112,6 +120,7 @@ int SekInit()
     m68k_set_cpu_type(M68K_CPU_TYPE_68000);\r
     m68k_init();\r
     m68k_set_int_ack_callback(SekIntAckM68K);\r
+    m68k_set_tas_instr_callback(SekTasCallback);\r
     m68k_pulse_reset(); // Init cpu emulator\r
     m68k_set_context(oldcontext);\r
   }\r
@@ -121,12 +130,12 @@ int SekInit()
 }\r
 \r
 // Reset the 68000:\r
-int SekReset()\r
+PICO_INTERNAL int SekReset()\r
 {\r
   if (Pico.rom==NULL) return 1;\r
 \r
 #ifdef EMU_C68K\r
-  PicoCpu.stopped=0;\r
+  PicoCpu.state_flags=0;\r
   PicoCpu.osp=0;\r
   PicoCpu.srh =0x27; // Supervisor mode\r
   PicoCpu.flags=4;   // Z set\r
@@ -144,6 +153,8 @@ int SekReset()
 #endif\r
 #ifdef EMU_M68K\r
   m68k_set_context(&PicoM68kCPU); // if we ever reset m68k, we always need it's context to be set\r
+  m68ki_cpu.sp[0]=0;\r
+  m68k_set_irq(0);\r
   m68k_pulse_reset();\r
 #endif\r
 \r
@@ -151,8 +162,15 @@ int SekReset()
 }\r
 \r
 \r
-int SekInterrupt(int irq)\r
+PICO_INTERNAL int SekInterrupt(int irq)\r
 {\r
+#if defined(EMU_C68K) && defined(EMU_M68K)\r
+  {\r
+    extern unsigned int dbg_irq_level;\r
+    dbg_irq_level=irq;\r
+    return 0;\r
+  }\r
+#endif\r
 #ifdef EMU_C68K\r
   PicoCpu.irq=irq;\r
 #endif\r
@@ -174,7 +192,7 @@ int SekInterrupt(int irq)
 //int SekPc() { return M68000_regs.pc; }\r
 //int SekPc() { return m68k_get_reg(NULL, M68K_REG_PC); }\r
 \r
-void SekState(unsigned char *data)\r
+PICO_INTERNAL void SekState(unsigned char *data)\r
 {\r
 #ifdef EMU_C68K\r
   memcpy(data,PicoCpu.d,0x44);\r
@@ -187,7 +205,7 @@ void SekState(unsigned char *data)
 #endif\r
 }\r
 \r
-void SekSetRealTAS(int use_real)\r
+PICO_INTERNAL void SekSetRealTAS(int use_real)\r
 {\r
 #ifdef EMU_C68K\r
   CycloneSetRealTAS(use_real);\r