X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FSek.c;h=24fda926fbf7ba2d27cef23fd14415052410d5c1;hb=29a951879b9e2d2f93f9aa3a34c2872e6cbf4e39;hp=e05f6f4ea5e9e81d176769eb2bea3bbb7f584b92;hpb=2433f409129279095926eb00cf8ab429738f80dd;p=picodrive.git

diff --git a/Pico/Sek.c b/Pico/Sek.c
index e05f6f4..24fda92 100644
--- a/Pico/Sek.c
+++ b/Pico/Sek.c
@@ -43,12 +43,13 @@ static int (*ResetCallback)()=DoReset;
 
 #ifdef EMU_C68K
 // interrupt acknowledgment
-static void SekIntAck(int level)
+static int SekIntAck(int level)
 {
   // try to emulate VDP's reaction to 68000 int ack
   if     (level == 4) Pico.video.pending_ints  =  0;
   else if(level == 6) Pico.video.pending_ints &= ~0x20;
   PicoCpu.irq = 0;
+  return CYCLONE_INT_ACK_AUTOVECTOR;
 }
 
 static void SekResetAck()
@@ -69,9 +70,15 @@ static int SekUnrecognizedOpcode()
   // see if we are not executing trash
   if (pc < 0x200 || (pc > Pico.romsize+4 && (pc&0xe00000)!=0xe00000)) {
     PicoCpu.cycles = 0;
-    PicoCpu.stopped = 1;
+    PicoCpu.state_flags |= 1;
     return 1;
   }
+#ifdef EMU_M68K // debugging cyclone
+  {
+    extern int have_illegal;
+    have_illegal = 1;
+  }
+#endif
   //exit(1);
   return 0;
 }
@@ -86,6 +93,11 @@ static int SekIntAckM68K(int level)
   CPU_INT_LEVEL = 0;
   return M68K_INT_ACK_AUTOVECTOR;
 }
+
+static int SekTasCallback(void)
+{
+  return 0; // no writeback
+}
 #endif
 
 
@@ -112,6 +124,7 @@ int SekInit()
     m68k_set_cpu_type(M68K_CPU_TYPE_68000);
     m68k_init();
     m68k_set_int_ack_callback(SekIntAckM68K);
+    m68k_set_tas_instr_callback(SekTasCallback);
     m68k_pulse_reset(); // Init cpu emulator
     m68k_set_context(oldcontext);
   }
@@ -126,7 +139,7 @@ int SekReset()
   if (Pico.rom==NULL) return 1;
 
 #ifdef EMU_C68K
-  PicoCpu.stopped=0;
+  PicoCpu.state_flags=0;
   PicoCpu.osp=0;
   PicoCpu.srh =0x27; // Supervisor mode
   PicoCpu.flags=4;   // Z set
@@ -144,6 +157,8 @@ int SekReset()
 #endif
 #ifdef EMU_M68K
   m68k_set_context(&PicoM68kCPU); // if we ever reset m68k, we always need it's context to be set
+  m68ki_cpu.sp[0]=0;
+  m68k_set_irq(0);
   m68k_pulse_reset();
 #endif
 
@@ -153,6 +168,13 @@ int SekReset()
 
 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
   PicoCpu.irq=irq;
 #endif