X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FSek.c;h=6295af5b0b3c73d7082c2f26e2c651e81bad4500;hb=1dceadaee482ad3ca6f5ccbef57ea93893f45e82;hp=c9d3737b106675d8107f7b555854cd711375fbf2;hpb=cc68a136aa179a5f32fe40208371eb9c2b0aadae;p=picodrive.git

diff --git a/Pico/cd/Sek.c b/Pico/cd/Sek.c
index c9d3737..6295af5 100644
--- a/Pico/cd/Sek.c
+++ b/Pico/cd/Sek.c
@@ -1,10 +1,4 @@
-// This is part of Pico Library
-
-// (c) Copyright 2004 Dave, All rights reserved.
 // (c) Copyright 2006 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
 
 
 #include "../PicoInt.h"
@@ -13,24 +7,75 @@
 int SekCycleCntS68k=0; // cycles done in this frame
 int SekCycleAimS68k=0; // cycle aim
 
+#ifdef EMU_C68K
+// ---------------------- Cyclone 68000 ----------------------
+struct Cyclone PicoCpuS68k;
+#endif
+
 #ifdef EMU_M68K
 // ---------------------- MUSASHI 68000 ----------------------
 m68ki_cpu_core PicoS68kCPU; // Mega CD's CPU
 #endif
 
+static int new_irq_level(int level)
+{
+  int level_new = 0, irqs;
+  Pico_mcd->m.s68k_pend_ints &= ~(1 << level);
+  irqs = Pico_mcd->m.s68k_pend_ints;
+  irqs &= Pico_mcd->s68k_regs[0x33];
+  while ((irqs >>= 1)) level_new++;
+
+  return level_new;
+}
 
 #ifdef EMU_M68K
-int SekIntAckS68k(int level)
+static int SekIntAckS68kM(int level)
 {
-  dprintf("s68k: int %i ack [%i|%i]", level, Pico.m.scanline, SekCyclesDone());
-  CPU_INT_LEVEL = 0;
+  int level_new = new_irq_level(level);
+  dprintf("s68kACK %i -> %i", level, level_new);
+  CPU_INT_LEVEL = level_new << 8;
   return M68K_INT_ACK_AUTOVECTOR;
 }
 #endif
 
+#ifdef EMU_C68K
+// interrupt acknowledgement
+static int SekIntAckS68k(int level)
+{
+  int level_new = new_irq_level(level);
+
+  dprintf("s68kACK %i -> %i", level, level_new);
+  PicoCpuS68k.irq = level_new;
+  return CYCLONE_INT_ACK_AUTOVECTOR;
+}
+
+static void SekResetAckS68k(void)
+{
+  dprintf("s68k: Reset encountered @ %06x", SekPcS68k);
+}
+
+static int SekUnrecognizedOpcodeS68k(void)
+{
+  unsigned int pc, op;
+  pc = SekPcS68k;
+  op = PicoCpuS68k.read16(pc);
+  dprintf("Unrecognized Opcode %04x @ %06x", op, pc);
+  //exit(1);
+  return 0;
+}
+#endif
+
+
 
-int SekInitS68k()
+PICO_INTERNAL int SekInitS68k()
 {
+#ifdef EMU_C68K
+//  CycloneInit();
+  memset(&PicoCpuS68k,0,sizeof(PicoCpuS68k));
+  PicoCpuS68k.IrqCallback=SekIntAckS68k;
+  PicoCpuS68k.ResetCallback=SekResetAckS68k;
+  PicoCpuS68k.UnrecognizedCallback=SekUnrecognizedOpcodeS68k;
+#endif
 #ifdef EMU_M68K
   {
     // Musashi is not very context friendly..
@@ -38,7 +83,7 @@ int SekInitS68k()
     m68k_set_context(&PicoS68kCPU);
     m68k_set_cpu_type(M68K_CPU_TYPE_68000);
     m68k_init();
-    m68k_set_int_ack_callback(SekIntAckS68k);
+    m68k_set_int_ack_callback(SekIntAckS68kM);
 //  m68k_pulse_reset(); // not yet, memmap is not set up
     m68k_set_context(oldcontext);
   }
@@ -48,15 +93,27 @@ int SekInitS68k()
 }
 
 // Reset the 68000:
-int SekResetS68k()
+PICO_INTERNAL int SekResetS68k()
 {
   if (Pico.rom==NULL) return 1;
 
+#ifdef EMU_C68K
+  PicoCpuS68k.state_flags=0;
+  PicoCpuS68k.osp=0;
+  PicoCpuS68k.srh =0x27; // Supervisor mode
+  PicoCpuS68k.flags=4;   // Z set
+  PicoCpuS68k.irq=0;
+  PicoCpuS68k.a[7]=PicoCpuS68k.read32(0); // Stack Pointer
+  PicoCpuS68k.membase=0;
+  PicoCpuS68k.pc=PicoCpuS68k.checkpc(PicoCpuS68k.read32(4)); // Program Counter
+#endif
 #ifdef EMU_M68K
   {
     void *oldcontext = m68ki_cpu_p;
 
     m68k_set_context(&PicoS68kCPU);
+    m68ki_cpu.sp[0]=0;
+    m68k_set_irq(0);
     m68k_pulse_reset();
     m68k_set_context(oldcontext);
   }
@@ -65,12 +122,20 @@ int SekResetS68k()
   return 0;
 }
 
-int SekInterruptS68k(int irq)
+PICO_INTERNAL int SekInterruptS68k(int irq)
 {
+  int irqs, real_irq = 1;
+  Pico_mcd->m.s68k_pend_ints |= 1 << irq;
+  irqs = Pico_mcd->m.s68k_pend_ints >> 1;
+  while ((irqs >>= 1)) real_irq++; // this is probably only needed for Cyclone
+
+#ifdef EMU_C68K
+  PicoCpuS68k.irq=real_irq;
+#endif
 #ifdef EMU_M68K
   void *oldcontext = m68ki_cpu_p;
   m68k_set_context(&PicoS68kCPU);
-  m68k_set_irq(irq); // raise irq (gets lowered after taken or must be done in ack)
+  m68k_set_irq(real_irq); // raise irq (gets lowered after taken or must be done in ack)
   m68k_set_context(oldcontext);
 #endif
   return 0;