unsigned int cycles)\r
{\r
unsigned int addr = spu.spuAddr, irq_addr = regAreaGet(H_SPUirqAddr) << 3;\r
- int i, irq;\r
+ int i, irq_after;\r
\r
- do_samples_if_needed(cycles, 1);\r
- irq = addr <= irq_addr && irq_addr < addr + iSize*2;\r
+ do_samples_if_needed(cycles, 1, 2);\r
+ irq_after = (irq_addr - addr) & 0x7ffff;\r
\r
for(i = 0; i < iSize; i++)\r
{\r
addr += 2;\r
addr &= 0x7fffe;\r
}\r
- if (irq && (spu.spuCtrl & CTRL_IRQ))\r
- log_unhandled("rdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);\r
+ if ((spu.spuCtrl & CTRL_IRQ) && irq_after < iSize * 2) {\r
+ log_unhandled("rdma spu irq: %x/%x-%x\n", irq_addr, spu.spuAddr, addr);\r
+ do_irq_io(irq_after);\r
+ }\r
spu.spuAddr = addr;\r
set_dma_end(iSize, cycles);\r
}\r
unsigned int cycles)\r
{\r
unsigned int addr = spu.spuAddr, irq_addr = regAreaGet(H_SPUirqAddr) << 3;\r
- int i, irq;\r
+ int i, irq_after;\r
\r
- do_samples_if_needed(cycles, 1);\r
+ do_samples_if_needed(cycles + iSize*2 * 4, 1, 2);\r
+ irq_after = (irq_addr - addr) & 0x7ffff;\r
spu.bMemDirty = 1;\r
- irq = addr <= irq_addr && irq_addr < addr + iSize*2;\r
\r
if (addr + iSize*2 < 0x80000)\r
{\r
}\r
else\r
{\r
- irq |= irq_addr < ((addr + iSize*2) & 0x7ffff);\r
for (i = 0; i < iSize; i++)\r
{\r
*(unsigned short *)(spu.spuMemC + addr) = *pusPSXMem++;\r
addr &= 0x7fffe;\r
}\r
}\r
- if (irq && (spu.spuCtrl & CTRL_IRQ)) // unhandled because need to implement delay\r
- log_unhandled("wdma spu irq: %x/%x+%x\n", irq_addr, spu.spuAddr, iSize * 2);\r
+ if ((spu.spuCtrl & CTRL_IRQ) && irq_after < iSize * 2) {\r
+ log_unhandled("%u wdma spu irq: %x/%x-%x (%u)\n",\r
+ cycles, irq_addr, spu.spuAddr, addr, irq_after);\r
+ // this should be consistent with psxdma.c timing\r
+ // might also need more delay like in set_dma_end()\r
+ do_irq_io(irq_after * 4);\r
+ }\r
+ for (i = 0; i < 24; i++) {\r
+ size_t ediff, p = spu.s_chan[i].pCurr - spu.spuMemC;\r
+ if (spu.s_chan[i].ADSRX.State == ADSR_RELEASE && !spu.s_chan[i].ADSRX.EnvelopeVol)\r
+ continue;\r
+ ediff = addr - p;\r
+ if (spu.spuAddr < p && p < spu.spuAddr + iSize * 2) {\r
+ log_unhandled("%u spu ch%02d play %zx dma %x-%x (%zd)\n",\r
+ cycles, i, p, spu.spuAddr, addr, ediff);\r
+ //exit(1);\r
+ }\r
+ // a hack for the super annoying timing issues in The Emperor's New Groove\r
+ // (which is a game bug, but tends to trigger more here)\r
+ if (ediff <= 0x20u) {\r
+ spu.s_chan[i].pCurr += ediff;\r
+ break;\r
+ }\r
+ }\r
spu.spuAddr = addr;\r
set_dma_end(iSize, cycles);\r
}\r
\r
////////////////////////////////////////////////////////////////////////\r
+// vim:shiftwidth=1:expandtab\r