spu: fix first sample, don't play ahead

[pcsx_rearmed.git] / libpcsxcore / psxdma.c

diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index b7d6d6a..ff7d6a3 100644 (file)
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -22,13 +22,17 @@
 */
 
 #include "psxdma.h"
+#include "gpu.h"
 
 // Dma0/1 in Mdec.c
 // Dma3   in CdRom.c
 
 void spuInterrupt() {
-       HW_DMA4_CHCR &= SWAP32(~0x01000000);
-       DMA_INTERRUPT(4);
+       if (HW_DMA4_CHCR & SWAP32(0x01000000))
+       {
+               HW_DMA4_CHCR &= SWAP32(~0x01000000);
+               DMA_INTERRUPT(4);
+       }
 }
 
 void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
@@ -47,7 +51,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
 #endif
                                break;
                        }
-                       SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2);
+                       SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2, psxRegs.cycle);
                        SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2);
                        return;
 
@@ -63,7 +67,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
                                break;
                        }
                        size = (bcr >> 16) * (bcr & 0xffff) * 2;
-                       SPU_readDMAMem(ptr, size);
+                       SPU_readDMAMem(ptr, size, psxRegs.cycle);
                        psxCpu->Clear(madr, size);
                        break;
 
@@ -140,7 +144,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
                        psxCpu->Clear(madr, size);
 
                        // already 32-bit word size ((size * 4) / 4)
-                       GPUDMA_INT(size);
+                       GPUDMA_INT(size / 4);
                        return;
 
                case 0x01000201: // mem2vram
@@ -159,7 +163,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
                        GPU_writeDataMem(ptr, size);
 
                        // already 32-bit word size ((size * 4) / 4)
-                       GPUDMA_INT(size);
+                       GPUDMA_INT(size / 4);
                        return;
 
                case 0x01000401: // dma chain
@@ -167,8 +171,10 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
                        PSXDMA_LOG("*** DMA 2 - GPU dma chain *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
 #endif
 
-                       size = gpuDmaChainSize(madr);
-                       GPU_dmaChain((u32 *)psxM, madr & 0x1fffff);
+                       size = GPU_dmaChain((u32 *)psxM, madr & 0x1fffff);
+                       if ((int)size <= 0)
+                               size = gpuDmaChainSize(madr);
+                       HW_GPU_STATUS &= ~PSXGPU_nBUSY;
                        
                        // Tekken 3 = use 1.0 only (not 1.5x)
 
@@ -191,8 +197,12 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 }
 
 void gpuInterrupt() {
-       HW_DMA2_CHCR &= SWAP32(~0x01000000);
-       DMA_INTERRUPT(2);
+       if (HW_DMA2_CHCR & SWAP32(0x01000000))
+       {
+               HW_DMA2_CHCR &= SWAP32(~0x01000000);
+               DMA_INTERRUPT(2);
+       }
+       HW_GPU_STATUS |= PSXGPU_nBUSY; // GPU no longer busy
 }
 
 void psxDma6(u32 madr, u32 bcr, u32 chcr) {
@@ -238,6 +248,9 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) {
 
 void gpuotcInterrupt()
 {
-       HW_DMA6_CHCR &= SWAP32(~0x01000000);
-       DMA_INTERRUPT(6);
+       if (HW_DMA6_CHCR & SWAP32(0x01000000))
+       {
+               HW_DMA6_CHCR &= SWAP32(~0x01000000);
+               DMA_INTERRUPT(6);
+       }
 }