#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
}
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);
- if (ptr == NULL) {
+ ptr = getDmaRam(madr, &words_max);
+ if (ptr == INVALID_PTR) {
#ifdef CPU_LOG
CPU_LOG("*** DMA4 SPU - mem2spu *** NULL Pointer!!!\n");
#endif
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;
#ifdef PSXDMA_LOG
PSXDMA_LOG("*** DMA4 SPU - spu2mem *** %x addr = %x size = %x\n", chcr, madr, bcr);
#endif
- ptr = (u16 *)PSXM(madr);
- if (ptr == NULL) {
+ ptr = getDmaRam(madr, &words_max);
+ if (ptr == INVALID_PTR) {
#ifdef CPU_LOG
CPU_LOG("*** DMA4 SPU - spu2mem *** NULL Pointer!!!\n");
#endif
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);
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);
}
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);
- if (ptr == NULL) {
+ ptr = getDmaRam(madr, &words_max);
+ if (ptr == INVALID_PTR) {
#ifdef CPU_LOG
CPU_LOG("*** DMA2 GPU - vram2mem *** NULL Pointer!!!\n");
#endif
}
// 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);
#ifdef PSXDMA_LOG
PSXDMA_LOG("*** DMA 2 - GPU mem2vram *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
#endif
- ptr = (u32 *)PSXM(madr);
- if (ptr == NULL) {
+ ptr = getDmaRam(madr, &words_max);
+ if (ptr == INVALID_PTR) {
#ifdef CPU_LOG
CPU_LOG("*** DMA2 GPU - mem2vram *** NULL Pointer!!!\n");
#endif
}
// 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);
#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 &= 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;
-#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);
}
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);
#endif
if (chcr == 0x11000002) {
- if (mem == NULL) {
+ if (mem == INVALID_PTR) {
#ifdef CPU_LOG
CPU_LOG("*** DMA6 OT *** NULL Pointer!!!\n");
#endif
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);
notaz.gp2x.de / pcsx_rearmed.git / blobdiff