dma: add optional slow linked list walking

[pcsx_rearmed.git] / libpcsxcore / psxdma.c

diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index b0f3fba..30aa9bd 100644 (file)
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -45,7 +45,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
                        PSXDMA_LOG("*** DMA4 SPU - mem2spu *** %x addr = %x size = %x\n", chcr, madr, bcr);
 #endif
                        ptr = (u16 *)PSXM(madr);
-                       if (ptr == NULL) {
+                       if (ptr == INVALID_PTR) {
 #ifdef CPU_LOG
                                CPU_LOG("*** DMA4 SPU - mem2spu *** NULL Pointer!!!\n");
 #endif
@@ -54,7 +54,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
                        words = (bcr >> 16) * (bcr & 0xffff);
                        SPU_writeDMAMem(ptr, words * 2, psxRegs.cycle);
                        HW_DMA4_MADR = SWAPu32(madr + words * 4);
-                       SPUDMA_INT(words / 2);
+                       SPUDMA_INT(words * 4);
                        return;
 
                case 0x01000200: //spu to cpu transfer
@@ -62,7 +62,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
                        PSXDMA_LOG("*** DMA4 SPU - spu2mem *** %x addr = %x size = %x\n", chcr, madr, bcr);
 #endif
                        ptr = (u16 *)PSXM(madr);
-                       if (ptr == NULL) {
+                       if (ptr == INVALID_PTR) {
 #ifdef CPU_LOG
                                CPU_LOG("*** DMA4 SPU - spu2mem *** NULL Pointer!!!\n");
 #endif
@@ -73,14 +73,12 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
                        psxCpu->Clear(madr, words);
 
                        HW_DMA4_MADR = SWAPu32(madr + words * 4);
-                       SPUDMA_INT(words / 2);
+                       SPUDMA_INT(words * 4);
                        return;
 
-#ifdef PSXDMA_LOG
                default:
-                       PSXDMA_LOG("*** DMA4 SPU - unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
+                       log_unhandled("*** DMA4 SPU - unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
                        break;
-#endif
        }
 
        HW_DMA4_CHCR &= SWAP32(~0x01000000);
@@ -122,13 +120,15 @@ static u32 gpuDmaChainSize(u32 addr) {
                // next 32-bit pointer
                addr = psxMu32( addr & ~0x3 ) & 0xffffff;
                size += 1;
-       } while (addr != 0xffffff);
+       } while (!(addr & 0x800000)); // contrary to some documentation, the end-of-linked-list marker is not actually 0xFF'FFFF
+                                  // any pointer with bit 23 set will do.
 
        return size;
 }
 
 void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
-       u32 *ptr;
+       u32 *ptr, madr_next, *madr_next_p;
+       int do_walking;
        u32 words;
        u32 size;
 
@@ -138,7 +138,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
                        PSXDMA_LOG("*** DMA2 GPU - vram2mem *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
 #endif
                        ptr = (u32 *)PSXM(madr);
-                       if (ptr == NULL) {
+                       if (ptr == INVALID_PTR) {
 #ifdef CPU_LOG
                                CPU_LOG("*** DMA2 GPU - vram2mem *** NULL Pointer!!!\n");
 #endif
@@ -160,7 +160,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
                        PSXDMA_LOG("*** DMA 2 - GPU mem2vram *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
 #endif
                        ptr = (u32 *)PSXM(madr);
-                       if (ptr == NULL) {
+                       if (ptr == INVALID_PTR) {
 #ifdef CPU_LOG
                                CPU_LOG("*** DMA2 GPU - mem2vram *** NULL Pointer!!!\n");
 #endif
@@ -180,30 +180,31 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 #ifdef PSXDMA_LOG
                        PSXDMA_LOG("*** DMA 2 - GPU dma chain *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
 #endif
+                       // when not emulating walking progress, end immediately
+                       madr_next = 0xffffff;
+
+                       do_walking = Config.GpuListWalking;
+                       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);
+                       size = GPU_dmaChain((u32 *)psxM, madr & 0x1fffff, madr_next_p);
                        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);
+                       HW_GPU_STATUS &= SWAP32(~PSXGPU_nBUSY);
+                       HW_DMA2_MADR = SWAPu32(madr_next);
 
                        // Tekken 3 = use 1.0 only (not 1.5x)
 
                        // Einhander = parse linked list in pieces (todo)
-                       // Final Fantasy 4 = internal vram time (todo)
                        // Rebel Assault 2 = parse linked list in pieces (todo)
-                       // Vampire Hunter D = allow edits to linked list (todo)
                        GPUDMA_INT(size);
                        return;
 
-#ifdef PSXDMA_LOG
                default:
-                       PSXDMA_LOG("*** DMA 2 - GPU unknown *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
+                       log_unhandled("*** DMA 2 - GPU unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
                        break;
-#endif
        }
 
        HW_DMA2_CHCR &= SWAP32(~0x01000000);
@@ -211,16 +212,24 @@ 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;
+               size = GPU_dmaChain((u32 *)psxM, HW_DMA2_MADR & 0x1fffff, &madr_next);
+               HW_DMA2_MADR = SWAPu32(madr_next);
+               GPUDMA_INT(size);
+               return;
+       }
        if (HW_DMA2_CHCR & SWAP32(0x01000000))
        {
                HW_DMA2_CHCR &= SWAP32(~0x01000000);
                DMA_INTERRUPT(2);
        }
-       HW_GPU_STATUS |= PSXGPU_nBUSY; // GPU no longer busy
+       HW_GPU_STATUS |= SWAP32(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
@@ -228,7 +237,7 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) {
 #endif
 
        if (chcr == 0x11000002) {
-               if (mem == NULL) {
+               if (mem == INVALID_PTR) {
 #ifdef CPU_LOG
                        CPU_LOG("*** DMA6 OT *** NULL Pointer!!!\n");
 #endif
@@ -238,23 +247,24 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) {
                }
 
                // already 32-bit size
-               size = bcr;
+               words = bcr;
 
                while (bcr--) {
                        *mem-- = SWAP32((madr - 4) & 0xffffff);
                        madr -= 4;
                }
-               mem++; *mem = 0xffffff;
+               *++mem = SWAP32(0xffffff);
 
-               GPUOTCDMA_INT(size);
+               //GPUOTCDMA_INT(size);
+               // halted
+               psxRegs.cycle += words;
+               GPUOTCDMA_INT(16);
                return;
        }
-#ifdef PSXDMA_LOG
        else {
                // Unknown option
-               PSXDMA_LOG("*** DMA6 OT - unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
+               log_unhandled("*** DMA6 OT - unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
        }
-#endif
 
        HW_DMA6_CHCR &= SWAP32(~0x01000000);
        DMA_INTERRUPT(6);