diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ARM.cpp | 2 | ||||
| -rw-r--r-- | src/NDS.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ARM.cpp b/src/ARM.cpp index 09ee17d..24858c2 100644 --- a/src/ARM.cpp +++ b/src/ARM.cpp @@ -461,7 +461,7 @@ s32 ARMv5::Execute() else { Cycles = CyclesToRun; - NDS::RunTimingCriticalDevices(0, CyclesToRun >> ClockShift); + //NDS::RunTimingCriticalDevices(0, CyclesToRun >> ClockShift); return Cycles; } } diff --git a/src/NDS.cpp b/src/NDS.cpp index 28d459d..d3557d2 100644 --- a/src/NDS.cpp +++ b/src/NDS.cpp @@ -764,11 +764,13 @@ u32 RunFrame() if (CPUStop & 0x0FFF0000) { s32 cycles = ndscyclestorun - ARM7Offset; + s32 critcycles = cycles; cycles = DMAs[4]->Run(cycles); if (cycles > 0) cycles = DMAs[5]->Run(cycles); if (cycles > 0) cycles = DMAs[6]->Run(cycles); if (cycles > 0) cycles = DMAs[7]->Run(cycles); ARM7Offset = -cycles; + RunTimingCriticalDevices(1, critcycles); } else { |