X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxdma.c;h=03ee563913ad9402a1b62af612b218b0d7689dc6;hb=refs%2Fheads%2Fmaster;hp=3ec42ede22884ff4c5f07aa334183c75b80ca55e;hpb=b54a1ac7cfa3f045afef2e04d3e255884c3d5ef0;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index 3ec42ede..6dc5d63b 100644
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -90,6 +90,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
 	DMA_INTERRUPT(4);
 }
 
+#if 0
 // Taken from PEOPS SOFTGPU
 static inline boolean CheckForEndlessLoop(u32 laddr, u32 *lUsedAddr) {
 	if (laddr == lUsedAddr[1]) return TRUE;
@@ -130,16 +131,19 @@ static u32 gpuDmaChainSize(u32 addr) {
 
 	return size;
 }
+#endif
 
 void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
-	u32 *ptr, madr_next, *madr_next_p, size;
+	u32 *ptr, madr_next, *madr_next_p;
 	u32 words, words_left, words_max, words_copy;
+	s32 cycles_last_cmd = 0;
 	int do_walking;
+	long cycles_sum;
 
 	madr &= ~3;
 	switch (chcr) {
 		case 0x01000200: // vram2mem
-			PSXDMA_LOG("*** DMA2 GPU - vram2mem *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
+			PSXDMA_LOG("*** DMA2 GPU - vram2mem *** %x addr = %x size = %x\n", chcr, madr, bcr);
 			ptr = getDmaRam(madr, &words_max);
 			if (ptr == INVALID_PTR) {
 				log_unhandled("bad dma2 madr %x\n", madr);
@@ -163,7 +167,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 			return;
 
 		case 0x01000201: // mem2vram
-			PSXDMA_LOG("*** DMA 2 - GPU mem2vram *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
+			PSXDMA_LOG("*** DMA 2 - GPU mem2vram *** %x addr = %x size = %x\n", chcr, madr, bcr);
 			words = words_left = (bcr >> 16) * (bcr & 0xffff);
 			while (words_left > 0) {
 				ptr = getDmaRam(madr, &words_max);
@@ -186,27 +190,30 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 			return;
 
 		case 0x01000401: // dma chain
-			PSXDMA_LOG("*** DMA 2 - GPU dma chain *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
+			PSXDMA_LOG("*** DMA 2 - GPU dma chain *** %x addr = %x size = %x\n", chcr, madr, bcr);
 			// when not emulating walking progress, end immediately
+			// (some games abort the dma and read madr so break out of that logic)
 			madr_next = 0xffffff;
 
 			do_walking = Config.GpuListWalking;
-			if (do_walking < 0 || Config.hacks.gpu_timing1024)
+			if (do_walking < 0)
 				do_walking = Config.hacks.gpu_slow_list_walking;
 			madr_next_p = do_walking ? &madr_next : NULL;
 
-			size = GPU_dmaChain((u32 *)psxM, madr & 0x1fffff, madr_next_p);
-			if ((int)size <= 0)
-				size = gpuDmaChainSize(madr);
+			cycles_sum = GPU_dmaChain((u32 *)psxM, madr & 0x1fffff,
+					madr_next_p, &cycles_last_cmd);
 
 			HW_DMA2_MADR = SWAPu32(madr_next);
 
-			// a hack for Judge Dredd which is annoyingly sensitive to timing
-			if (Config.hacks.gpu_timing1024)
-				size = 1024;
+			// timing hack with some lame heuristics
+			if (Config.gpu_timing_override && (do_walking || cycles_sum > 64)
+			    && !(HW_GPU_STATUS & SWAP32(PSXGPU_DHEIGHT | PSXGPU_RGB24)))
+				cycles_sum = Config.gpu_timing_override;
 
-			psxRegs.gpuIdleAfter = psxRegs.cycle + size + 16;
-			set_event(PSXINT_GPUDMA, size);
+			psxRegs.gpuIdleAfter = psxRegs.cycle + cycles_sum + cycles_last_cmd;
+			set_event(PSXINT_GPUDMA, cycles_sum);
+			//printf("%u dma2cf: %6ld,%4d %08x %08x %08x %08x\n", psxRegs.cycle,
+			//  cycles_sum, cycles_last_cmd, madr, bcr, chcr, HW_DMA2_MADR);
 			return;
 
 		default:
@@ -221,11 +228,21 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 void gpuInterrupt() {
 	if (HW_DMA2_CHCR == SWAP32(0x01000401) && !(HW_DMA2_MADR & SWAP32(0x800000)))
 	{
-		u32 size, madr_next = 0xffffff, madr = SWAPu32(HW_DMA2_MADR);
-		size = GPU_dmaChain((u32 *)psxM, madr & 0x1fffff, &madr_next);
+		u32 madr_next = SWAPu32(HW_DMA2_MADR);
+		s32 cycles_sum = psxRegs.gpuIdleAfter - psxRegs.cycle;
+		s32 cycles_last_cmd = 0;
+
+		do {
+			cycles_sum += cycles_last_cmd;
+			cycles_sum += GPU_dmaChain((u32 *)psxM, madr_next & 0x1fffff,
+					&madr_next, &cycles_last_cmd);
+		}
+		while (cycles_sum <= 0 && !(madr_next & 0x800000));
 		HW_DMA2_MADR = SWAPu32(madr_next);
-		psxRegs.gpuIdleAfter = psxRegs.cycle + size + 64;
-		set_event(PSXINT_GPUDMA, size);
+		psxRegs.gpuIdleAfter = psxRegs.cycle + cycles_sum + cycles_last_cmd;
+		set_event(PSXINT_GPUDMA, cycles_sum);
+		//printf("%u dma2cn: %6d,%4d %08x\n", psxRegs.cycle, cycles_sum,
+		//  cycles_last_cmd, HW_DMA2_MADR);
 		return;
 	}
 	if (HW_DMA2_CHCR & SWAP32(0x01000000))
@@ -235,6 +252,10 @@ void gpuInterrupt() {
 	}
 }
 
+void psxAbortDma2() {
+	psxRegs.gpuIdleAfter = psxRegs.cycle + 32;
+}
+
 void psxDma6(u32 madr, u32 bcr, u32 chcr) {
 	u32 words, words_max;
 	u32 *mem;