X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxdma.c;h=03ee563913ad9402a1b62af612b218b0d7689dc6;hp=b7d6d6a07c6634eb5189dc30983f3834a6ea2abc;hb=fc4803bdc2c9840a007c60e422fb0531107b80f2;hpb=57a757cedcc7928894aaf957565adfa95f1caab5

diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index b7d6d6a0..03ee5639 100644
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -22,18 +22,22 @@
 */
 
 #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
 	u16 *ptr;
-	u32 size;
+	u32 words;
 
 	switch (chcr) {
 		case 0x01000201: //cpu to spu transfer
@@ -47,8 +51,10 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
 #endif
 				break;
 			}
-			SPU_writeDMAMem(ptr, (bcr >> 16) * (bcr & 0xffff) * 2);
-			SPUDMA_INT((bcr >> 16) * (bcr & 0xffff) / 2);
+			words = (bcr >> 16) * (bcr & 0xffff);
+			SPU_writeDMAMem(ptr, words * 2, psxRegs.cycle);
+			HW_DMA4_MADR = SWAPu32(madr + words * 4);
+			SPUDMA_INT(words / 2);
 			return;
 
 		case 0x01000200: //spu to cpu transfer
@@ -62,10 +68,13 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
 #endif
 				break;
 			}
-			size = (bcr >> 16) * (bcr & 0xffff) * 2;
-			SPU_readDMAMem(ptr, size);
-			psxCpu->Clear(madr, size);
-			break;
+			words = (bcr >> 16) * (bcr & 0xffff);
+			SPU_readDMAMem(ptr, words * 2, psxRegs.cycle);
+			psxCpu->Clear(madr, words);
+
+			HW_DMA4_MADR = SWAPu32(madr + words * 4);
+			SPUDMA_INT(words / 2);
+			return;
 
 #ifdef PSXDMA_LOG
 		default:
@@ -120,6 +129,7 @@ static u32 gpuDmaChainSize(u32 addr) {
 
 void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 	u32 *ptr;
+	u32 words;
 	u32 size;
 
 	switch (chcr) {
@@ -135,12 +145,14 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 				break;
 			}
 			// BA blocks * BS words (word = 32-bits)
-			size = (bcr >> 16) * (bcr & 0xffff);
-			GPU_readDataMem(ptr, size);
-			psxCpu->Clear(madr, size);
+			words = (bcr >> 16) * (bcr & 0xffff);
+			GPU_readDataMem(ptr, words);
+			psxCpu->Clear(madr, words);
+
+			HW_DMA2_MADR = SWAPu32(madr + words * 4);
 
 			// already 32-bit word size ((size * 4) / 4)
-			GPUDMA_INT(size);
+			GPUDMA_INT(words / 4);
 			return;
 
 		case 0x01000201: // mem2vram
@@ -155,11 +167,13 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 				break;
 			}
 			// BA blocks * BS words (word = 32-bits)
-			size = (bcr >> 16) * (bcr & 0xffff);
-			GPU_writeDataMem(ptr, size);
+			words = (bcr >> 16) * (bcr & 0xffff);
+			GPU_writeDataMem(ptr, words);
+
+			HW_DMA2_MADR = SWAPu32(madr + words * 4);
 
 			// already 32-bit word size ((size * 4) / 4)
-			GPUDMA_INT(size);
+			GPUDMA_INT(words / 4);
 			return;
 
 		case 0x01000401: // dma chain
@@ -167,9 +181,15 @@ 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;
+
+			// we don't emulate progress, just busy flag and end irq,
+			// so pretend we're already at the last block
+			HW_DMA2_MADR = SWAPu32(0xffffff);
+
 			// Tekken 3 = use 1.0 only (not 1.5x)
 
 			// Einhander = parse linked list in pieces (todo)
@@ -191,12 +211,16 @@ 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) {
-	u32 size;
+	u32 words;
 	u32 *mem = (u32 *)PSXM(madr);
 
 #ifdef PSXDMA_LOG
@@ -214,7 +238,7 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) {
 		}
 
 		// already 32-bit size
-		size = bcr;
+		words = bcr;
 
 		while (bcr--) {
 			*mem-- = SWAP32((madr - 4) & 0xffffff);
@@ -222,7 +246,10 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) {
 		}
 		mem++; *mem = 0xffffff;
 
-		GPUOTCDMA_INT(size);
+		//GPUOTCDMA_INT(size);
+		// halted
+		psxRegs.cycle += words;
+		GPUOTCDMA_INT(16);
 		return;
 	}
 #ifdef PSXDMA_LOG
@@ -238,6 +265,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);
+	}
 }