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

fix bugs 

still kinda shitty tho. like, we lost enough timer accuracy to have visible effects (aging cart tests that fail, FMVs that play too slow, etc)
This commit is contained in:
StapleButter 2018-12-09 01:46:10 +01:00
parent b569c03884
commit aba4610d45
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ARM.cpp
View File

@ -461,7 +461,7 @@ s32 ARMv5::Execute()
else else
{ {
Cycles = CyclesToRun; Cycles = CyclesToRun;
NDS::RunTimingCriticalDevices(0, CyclesToRun >> ClockShift); //NDS::RunTimingCriticalDevices(0, CyclesToRun >> ClockShift);
return Cycles; return Cycles;
} }
} }

2
src/NDS.cpp
View File

@ -764,11 +764,13 @@ u32 RunFrame()
if (CPUStop & 0x0FFF0000) if (CPUStop & 0x0FFF0000)
{ {
s32 cycles = ndscyclestorun - ARM7Offset; s32 cycles = ndscyclestorun - ARM7Offset;
s32 critcycles = cycles;
cycles = DMAs[4]->Run(cycles); cycles = DMAs[4]->Run(cycles);
if (cycles > 0) cycles = DMAs[5]->Run(cycles); if (cycles > 0) cycles = DMAs[5]->Run(cycles);
if (cycles > 0) cycles = DMAs[6]->Run(cycles); if (cycles > 0) cycles = DMAs[6]->Run(cycles);
if (cycles > 0) cycles = DMAs[7]->Run(cycles); if (cycles > 0) cycles = DMAs[7]->Run(cycles);
ARM7Offset = -cycles; ARM7Offset = -cycles;
RunTimingCriticalDevices(1, critcycles);
} }
else else
{ {