X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FSek.c;h=84d780709525c1c3b67dd8349be31e5ce6110130;hb=9037e45d9f2752fdd6ebbc01328148839403a84f;hp=449a4d7a59d62d96844f0db9d560cc6011da9c90;hpb=3aa1e148a28da9b4e10e824984f7b3a4908b1ace;p=picodrive.git

diff --git a/Pico/Sek.c b/Pico/Sek.c
index 449a4d7..84d7807 100644
--- a/Pico/Sek.c
+++ b/Pico/Sek.c
@@ -104,6 +104,7 @@ PICO_INTERNAL int SekInit()
   PicoCpuCM68k.IrqCallback=SekIntAck;
   PicoCpuCM68k.ResetCallback=SekResetAck;
   PicoCpuCM68k.UnrecognizedCallback=SekUnrecognizedOpcode;
+  PicoCpuCM68k.flags=4;   // Z set
 #endif
 #ifdef EMU_M68K
   {
@@ -113,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
@@ -122,8 +123,9 @@ PICO_INTERNAL int SekInit()
     void *oldcontext = g_m68kcontext;
     g_m68kcontext = &PicoCpuFM68k;
     memset(&PicoCpuFM68k, 0, sizeof(PicoCpuFM68k));
-    m68k_init();
+    fm68k_init();
     PicoCpuFM68k.iack_handler = SekIntAckF68K;
+    PicoCpuFM68k.sr = 0x2704; // Z flag
     g_m68kcontext = oldcontext;
   }
 #endif
@@ -141,7 +143,6 @@ PICO_INTERNAL int SekReset()
   PicoCpuCM68k.state_flags=0;
   PicoCpuCM68k.osp=0;
   PicoCpuCM68k.srh =0x27; // Supervisor mode
-  PicoCpuCM68k.flags=4;   // Z set
   PicoCpuCM68k.irq=0;
   PicoCpuCM68k.a[7]=PicoCpuCM68k.read32(0); // Stack Pointer
   PicoCpuCM68k.membase=0;
@@ -152,11 +153,12 @@ PICO_INTERNAL int SekReset()
   m68ki_cpu.sp[0]=0;
   m68k_set_irq(0);
   m68k_pulse_reset();
+  REG_USP = 0; // ?
 #endif
 #ifdef EMU_F68K
   {
     g_m68kcontext = &PicoCpuFM68k;
-    m68k_reset();
+    fm68k_reset();
   }
 #endif
 
@@ -164,44 +166,20 @@ PICO_INTERNAL int SekReset()
 }
 
 
-PICO_INTERNAL 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
-  PicoCpuCM68k.irq=irq;
-#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);
-  }
-#endif
-#ifdef EMU_F68K
-  PicoCpuFM68k.interrupts[0]=irq;
-#endif
-
-  return 0;
-}
-
 // data must be word aligned
 PICO_INTERNAL void SekState(int *data)
 {
 #ifdef EMU_C68K
-  memcpy32(data,PicoCpuCM68k.d,0x44/4);
+  memcpy32(data,(int *)PicoCpuCM68k.d,0x44/4);
+  data[0x11] = PicoCpuCM68k.flags;
 #elif defined(EMU_M68K)
-  memcpy32(data, PicoCpuMM68k.dar, 0x40/4);
+  memcpy32(data, (int *)PicoCpuMM68k.dar, 0x40/4);
   data[0x10] = PicoCpuMM68k.pc;
+  data[0x11] = m68k_get_reg(&PicoCpuMM68k, M68K_REG_SR);
 #elif defined(EMU_F68K)
   memcpy32(data, (int *)PicoCpuFM68k.dreg, 0x40/4);
   data[0x10] = PicoCpuFM68k.pc;
+  data[0x11] = PicoCpuFM68k.sr;
 #endif
 }