spu: irq adjustments according to MiSTer

libretro/pcsx_rearmed#725

diff --git a/plugins/dfsound/dma.c b/plugins/dfsound/dma.c
index 43019f1..2f2d69a 100644 (file)
--- a/plugins/dfsound/dma.c
+++ b/plugins/dfsound/dma.c
@@ -20,6 +20,7 @@
 #define _IN_DMA\r
 \r
 #include "externals.h"\r
+#include "registers.h"\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
 // READ DMA (one value)\r
@@ -28,6 +29,7 @@
 unsigned short CALLBACK SPUreadDMA(void)\r
 {\r
  unsigned short s = *(unsigned short *)(spu.spuMemC + spu.spuAddr);\r
+ check_irq_io(spu.spuAddr);\r
  spu.spuAddr += 2;\r
  spu.spuAddr &= 0x7fffe;\r
 \r
@@ -41,26 +43,27 @@ unsigned short CALLBACK SPUreadDMA(void)
 void CALLBACK SPUreadDMAMem(unsigned short *pusPSXMem, int iSize,\r
  unsigned int cycles)\r
 {\r
- int i;\r
+ unsigned int addr = spu.spuAddr, irq_addr = regAreaGet(H_SPUirqAddr) << 3;\r
+ int i, irq;\r
 \r
  do_samples_if_needed(cycles, 1);\r
-\r
- for(i=0;i<iSize;i++)\r
-  {\r
-   *pusPSXMem++ = *(unsigned short *)(spu.spuMemC + spu.spuAddr);\r
-   spu.spuAddr += 2;\r
-   spu.spuAddr &= 0x7fffe;\r
-  }\r
+ irq = addr <= irq_addr && irq_addr < addr + iSize*2;\r
+\r
+ for(i = 0; i < iSize; i++)\r
+ {\r
+  *pusPSXMem++ = *(unsigned short *)(spu.spuMemC + addr);\r
+  addr += 2;\r
+  addr &= 0x7fffe;\r
+ }\r
+ if (irq && (spu.spuCtrl & CTRL_IRQ))\r
+  log_unhandled("wdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);\r
+ spu.spuAddr = addr;\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r
 ////////////////////////////////////////////////////////////////////////\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-// to investigate: do sound data updates by writedma affect spu\r
-// irqs? Will an irq be triggered, if new data is written to\r
-// the memory irq address?\r
-\r
 ////////////////////////////////////////////////////////////////////////\r
 // WRITE DMA (one value)\r
 ////////////////////////////////////////////////////////////////////////\r
@@ -69,6 +72,7 @@ void CALLBACK SPUwriteDMA(unsigned short val)
 {\r
  *(unsigned short *)(spu.spuMemC + spu.spuAddr) = val;\r
 \r
+ check_irq_io(spu.spuAddr);\r
  spu.spuAddr += 2;\r
  spu.spuAddr &= 0x7fffe;\r
  spu.bMemDirty = 1;\r
@@ -81,24 +85,31 @@ void CALLBACK SPUwriteDMA(unsigned short val)
 void CALLBACK SPUwriteDMAMem(unsigned short *pusPSXMem, int iSize,\r
  unsigned int cycles)\r
 {\r
- int i;\r
+ unsigned int addr = spu.spuAddr, irq_addr = regAreaGet(H_SPUirqAddr) << 3;\r
+ int i, irq;\r
  \r
  do_samples_if_needed(cycles, 1);\r
  spu.bMemDirty = 1;\r
-\r
- if(spu.spuAddr + iSize*2 < 0x80000)\r
-  {\r
-   memcpy(spu.spuMemC + spu.spuAddr, pusPSXMem, iSize*2);\r
-   spu.spuAddr += iSize*2;\r
-   return;\r
-  }\r
-\r
- for(i=0;i<iSize;i++)\r
+ irq = addr <= irq_addr && irq_addr < addr + iSize*2;\r
+\r
+ if (addr + iSize*2 < 0x80000)\r
+ {\r
+  memcpy(spu.spuMemC + addr, pusPSXMem, iSize*2);\r
+  addr += iSize*2;\r
+ }\r
+ else\r
+ {\r
+  irq |= irq_addr < ((addr + iSize*2) & 0x7ffff);\r
+  for (i = 0; i < iSize; i++)\r
   {\r
-   *(unsigned short *)(spu.spuMemC + spu.spuAddr) = *pusPSXMem++;\r
-   spu.spuAddr += 2;\r
-   spu.spuAddr &= 0x7fffe;\r
+   *(unsigned short *)(spu.spuMemC + addr) = *pusPSXMem++;\r
+   addr += 2;\r
+   addr &= 0x7fffe;\r
   }\r
+ }\r
+ if (irq && (spu.spuCtrl & CTRL_IRQ)) // unhandled because need to implement delay\r
+  log_unhandled("wdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);\r
+ spu.spuAddr = addr;\r
 }\r
 \r
 ////////////////////////////////////////////////////////////////////////\r

diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 5157412..f42ceff 100644 (file)
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -253,6 +253,7 @@ extern SPUInfo spu;
 \r
 void do_samples(unsigned int cycles_to, int do_sync);\r
 void schedule_next_irq(void);\r
+void check_irq_io(unsigned int addr);\r
 \r
 #define do_samples_if_needed(c, sync) \\r
  do { \\r

diff --git a/plugins/dfsound/registers.c b/plugins/dfsound/registers.c
index e00939e..a8fb59e 100644 (file)
--- a/plugins/dfsound/registers.c
+++ b/plugins/dfsound/registers.c
@@ -149,6 +149,8 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val,
       goto rvbd;\r
     //-------------------------------------------------//\r
     case H_SPUirqAddr:\r
+      //if (val & 1)\r
+      //  log_unhandled("w irq with lsb: %08lx %04x\n", reg, val);\r
       spu.pSpuIrq=spu.spuMemC+(((unsigned long) val<<3)&~0xf);\r
       goto upd_irq;\r
     //-------------------------------------------------//\r

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index 1127cd7..7f8ab1d 100644 (file)
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -212,7 +212,7 @@ static void do_irq(void)
 
 static int check_irq(int ch, unsigned char *pos)
 {
- if((spu.spuCtrl & CTRL_IRQ) && pos == spu.pSpuIrq)
+ if((spu.spuCtrl & (CTRL_ON|CTRL_IRQ)) == (CTRL_ON|CTRL_IRQ) && pos == spu.pSpuIrq)
  {
   //printf("ch%d irq %04x\n", ch, pos - spu.spuMemC);
   do_irq();
@@ -221,6 +221,17 @@ static int check_irq(int ch, unsigned char *pos)
  return 0;
 }
 
+void check_irq_io(unsigned int addr)
+{
+ unsigned int irq_addr = regAreaGet(H_SPUirqAddr) << 3;
+ //addr &= ~7; // ?
+ if((spu.spuCtrl & (CTRL_ON|CTRL_IRQ)) == (CTRL_ON|CTRL_IRQ) && addr == irq_addr)
+ {
+  //printf("io   irq %04x\n", irq_addr);
+  do_irq();
+ }
+}
+
 ////////////////////////////////////////////////////////////////////////
 // START SOUND... called by main thread to setup a new sound on a channel
 ////////////////////////////////////////////////////////////////////////
@@ -1136,6 +1147,7 @@ void do_samples(unsigned int cycles_to, int do_direct)
       do_irq();
      }
    }
+  check_irq_io(spu.spuAddr);
 
   if (unlikely(spu.rvb->dirty))
    REVERBPrep();