ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3773 from phire/if_you_want_100_cycles_ask_for_100_cycles 

"Instant" ARAM DMA shouldn't schedule and event too soon.
This commit is contained in:
Pierre Bourdon 2016-04-11 21:46:43 +02:00
parent 61ea5328f7 662ed217d7
commit 58d8c734b8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/HW/DSP.cpp
View File

@ -212,6 +212,7 @@ void EnableInstantDMA()
CoreTiming::RemoveEvent(et_CompleteARAM); CoreTiming::RemoveEvent(et_CompleteARAM);
CompleteARAM(0, 0); CompleteARAM(0, 0);
instant_dma = true; instant_dma = true;
ERROR_LOG(DSPINTERFACE, "Enabling Instant ARAM DMA hack");
} }
void FlushInstantDMA(u32 address) void FlushInstantDMA(u32 address)
@ -544,14 +545,12 @@ static void Do_ARAM_DMA()
// ARAM DMA transfer rate has been measured on real hw // ARAM DMA transfer rate has been measured on real hw
int ticksToTransfer = (g_arDMA.Cnt.count / 32) * 246; int ticksToTransfer = (g_arDMA.Cnt.count / 32) * 246;
// This is a huge hack that appears to be here only to fix Resident Evil 2/3
if (instant_dma) if (instant_dma)
ticksToTransfer = 0; ticksToTransfer = std::min(ticksToTransfer, 100);
CoreTiming::ScheduleEvent(ticksToTransfer, et_CompleteARAM); CoreTiming::ScheduleEvent(ticksToTransfer, et_CompleteARAM);
if (instant_dma)
CoreTiming::ForceExceptionCheck(100);
last_mmaddr = g_arDMA.MMAddr; last_mmaddr = g_arDMA.MMAddr;
last_aram_dma_count = g_arDMA.Cnt.count; last_aram_dma_count = g_arDMA.Cnt.count;