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

diff --git a/Pico/cd/Sek.c b/Pico/cd/Sek.c
index 5def9c1..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"
@@ -23,20 +17,21 @@ struct Cyclone PicoCpuS68k;
 m68ki_cpu_core PicoS68kCPU; // Mega CD's CPU
 #endif
 
-static int irqs = 0; // TODO: 2 context
+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
-static int SekIntAckS68k(int level)
+static int SekIntAckS68kM(int level)
 {
-  int level_new = 0;
-  irqs &= ~(1 << level);
-  irqs &= Pico_mcd->s68k_regs[0x33];
-  if (irqs) {
-    level_new = 6;
-    while (level_new > 0) { if (irqs & (1 << level_new)) break; level_new--; }
-  }
-
+  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;
@@ -44,27 +39,22 @@ static int SekIntAckS68k(int level)
 #endif
 
 #ifdef EMU_C68K
-// interrupt acknowledgment
-static void SekIntAck(int level)
+// interrupt acknowledgement
+static int SekIntAckS68k(int level)
 {
-  int level_new = 0;
-  irqs &= ~(1 << level);
-  irqs &= Pico_mcd->s68k_regs[0x33];
-  if (irqs) {
-    level_new = 6;
-    while (level_new > 0) { if (irqs & (1 << level_new)) break; level_new--; }
-  }
+  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 SekResetAck()
+static void SekResetAckS68k(void)
 {
   dprintf("s68k: Reset encountered @ %06x", SekPcS68k);
 }
 
-static int SekUnrecognizedOpcode()
+static int SekUnrecognizedOpcodeS68k(void)
 {
   unsigned int pc, op;
   pc = SekPcS68k;
@@ -77,14 +67,14 @@ static int SekUnrecognizedOpcode()
 
 
 
-int SekInitS68k()
+PICO_INTERNAL int SekInitS68k()
 {
 #ifdef EMU_C68K
 //  CycloneInit();
   memset(&PicoCpuS68k,0,sizeof(PicoCpuS68k));
-  PicoCpuS68k.IrqCallback=SekIntAck;
-  PicoCpuS68k.ResetCallback=SekResetAck;
-  PicoCpuS68k.UnrecognizedCallback=SekUnrecognizedOpcode;
+  PicoCpuS68k.IrqCallback=SekIntAckS68k;
+  PicoCpuS68k.ResetCallback=SekResetAckS68k;
+  PicoCpuS68k.UnrecognizedCallback=SekUnrecognizedOpcodeS68k;
 #endif
 #ifdef EMU_M68K
   {
@@ -93,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);
   }
@@ -103,12 +93,12 @@ int SekInitS68k()
 }
 
 // Reset the 68000:
-int SekResetS68k()
+PICO_INTERNAL int SekResetS68k()
 {
   if (Pico.rom==NULL) return 1;
 
 #ifdef EMU_C68K
-  PicoCpuS68k.stopped=0;
+  PicoCpuS68k.state_flags=0;
   PicoCpuS68k.osp=0;
   PicoCpuS68k.srh =0x27; // Supervisor mode
   PicoCpuS68k.flags=4;   // Z set
@@ -122,6 +112,8 @@ int SekResetS68k()
     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);
   }
@@ -130,16 +122,20 @@ int SekResetS68k()
   return 0;
 }
 
-int SekInterruptS68k(int irq)
+PICO_INTERNAL int SekInterruptS68k(int irq)
 {
-  irqs |= 1 << 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=irq;
+  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;