X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxdma.c;h=e15f0185da12aae99c12485ed7ec8561e1536d0e;hb=4d2f73bbb5d0ecbd8f21ce9d4c1fea1b27902648;hp=d7c4caecece9d5ecd3ffade8bb58146d0b3da729;hpb=7a8d521fba9c86ae7b51369ce061bf63112b745f;p=pcsx_rearmed.git diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c index d7c4caec..e15f0185 100644 --- a/libpcsxcore/psxdma.c +++ b/libpcsxcore/psxdma.c @@ -24,6 +24,10 @@ #include "psxdma.h" #include "gpu.h" +#ifndef min +#define min(a, b) ((b) < (a) ? (b) : (a)) +#endif + // Dma0/1 in Mdec.c // Dma3 in CdRom.c @@ -36,15 +40,15 @@ void spuInterrupt() { } void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU + u32 words, words_max, size; u16 *ptr; - u32 words; switch (chcr) { case 0x01000201: //cpu to spu transfer #ifdef PSXDMA_LOG PSXDMA_LOG("*** DMA4 SPU - mem2spu *** %x addr = %x size = %x\n", chcr, madr, bcr); #endif - ptr = (u16 *)PSXM(madr); + ptr = getDmaRam(madr, &words_max); if (ptr == INVALID_PTR) { #ifdef CPU_LOG CPU_LOG("*** DMA4 SPU - mem2spu *** NULL Pointer!!!\n"); @@ -52,8 +56,9 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU break; } words = (bcr >> 16) * (bcr & 0xffff); - SPU_writeDMAMem(ptr, words * 2, psxRegs.cycle); - HW_DMA4_MADR = SWAPu32(madr + words * 4); + size = min(words, words_max) * 2; + SPU_writeDMAMem(ptr, size, psxRegs.cycle); + HW_DMA4_MADR = SWAPu32((madr & ~3) + words * 4); SPUDMA_INT(words * 4); return; @@ -61,7 +66,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU #ifdef PSXDMA_LOG PSXDMA_LOG("*** DMA4 SPU - spu2mem *** %x addr = %x size = %x\n", chcr, madr, bcr); #endif - ptr = (u16 *)PSXM(madr); + ptr = getDmaRam(madr, &words_max); if (ptr == INVALID_PTR) { #ifdef CPU_LOG CPU_LOG("*** DMA4 SPU - spu2mem *** NULL Pointer!!!\n"); @@ -69,7 +74,8 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU break; } words = (bcr >> 16) * (bcr & 0xffff); - SPU_readDMAMem(ptr, words * 2, psxRegs.cycle); + size = min(words, words_max) * 2; + SPU_readDMAMem(ptr, size, psxRegs.cycle); psxCpu->Clear(madr, words); HW_DMA4_MADR = SWAPu32(madr + words * 4); @@ -127,16 +133,16 @@ static u32 gpuDmaChainSize(u32 addr) { } void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU - u32 *ptr; - u32 words; - u32 size; + u32 *ptr, madr_next, *madr_next_p, size; + u32 words, words_max, words_copy; + int do_walking; switch (chcr) { case 0x01000200: // vram2mem #ifdef PSXDMA_LOG PSXDMA_LOG("*** DMA2 GPU - vram2mem *** %lx addr = %lx size = %lx\n", chcr, madr, bcr); #endif - ptr = (u32 *)PSXM(madr); + ptr = getDmaRam(madr, &words_max); if (ptr == INVALID_PTR) { #ifdef CPU_LOG CPU_LOG("*** DMA2 GPU - vram2mem *** NULL Pointer!!!\n"); @@ -145,10 +151,11 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU } // BA blocks * BS words (word = 32-bits) words = (bcr >> 16) * (bcr & 0xffff); - GPU_readDataMem(ptr, words); - psxCpu->Clear(madr, words); + words_copy = min(words, words_max); + GPU_readDataMem(ptr, words_copy); + psxCpu->Clear(madr, words_copy); - HW_DMA2_MADR = SWAPu32(madr + words * 4); + HW_DMA2_MADR = SWAPu32((madr & ~3) + words * 4); // already 32-bit word size ((size * 4) / 4) GPUDMA_INT(words / 4); @@ -158,7 +165,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU #ifdef PSXDMA_LOG PSXDMA_LOG("*** DMA 2 - GPU mem2vram *** %lx addr = %lx size = %lx\n", chcr, madr, bcr); #endif - ptr = (u32 *)PSXM(madr); + ptr = getDmaRam(madr, &words_max); if (ptr == INVALID_PTR) { #ifdef CPU_LOG CPU_LOG("*** DMA2 GPU - mem2vram *** NULL Pointer!!!\n"); @@ -167,9 +174,9 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU } // BA blocks * BS words (word = 32-bits) words = (bcr >> 16) * (bcr & 0xffff); - GPU_writeDataMem(ptr, words); + GPU_writeDataMem(ptr, min(words, words_max)); - HW_DMA2_MADR = SWAPu32(madr + words * 4); + HW_DMA2_MADR = SWAPu32((madr & ~3) + words * 4); // already 32-bit word size ((size * 4) / 4) GPUDMA_INT(words / 4); @@ -179,22 +186,25 @@ 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; - size = GPU_dmaChain((u32 *)psxM, madr & 0x1fffff); + 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, madr_next_p); if ((int)size <= 0) size = gpuDmaChainSize(madr); - HW_GPU_STATUS &= SWAP32(~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; @@ -208,6 +218,14 @@ 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);