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

fix gxfifo stalls being borked under certain circumstances

This commit is contained in:
Jaklyy 2024-12-20 10:42:34 -05:00
parent e0ac68c9f2
commit 98d0a6b371
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/NDS.cpp
View File

@ -1645,7 +1645,7 @@ bool NDS::MainRAMHandle()
{ {
if (A9ContentionTS < ARM7Timestamp) if (A9ContentionTS < ARM7Timestamp)
{ {
if (ARM9.MRTrack.Type == MainRAMType::Null) return 0; if (ARM9.MRTrack.Type == MainRAMType::Null || (CPUStop & CPUStop_GXStall)) return 0;
MainRAMHandleARM9(); MainRAMHandleARM9();
} }
else else
@ -1661,7 +1661,7 @@ bool NDS::MainRAMHandle()
{ {
if (A9ContentionTS <= ARM7Timestamp) if (A9ContentionTS <= ARM7Timestamp)
{ {
if (ARM9.MRTrack.Type == MainRAMType::Null) return 0; if (ARM9.MRTrack.Type == MainRAMType::Null || (CPUStop & CPUStop_GXStall)) return 0;
MainRAMHandleARM9(); MainRAMHandleARM9();
} }
else else
@ -1748,15 +1748,15 @@ u32 NDS::RunFrame()
RunTimers(0); RunTimers(0);
GPU.GPU3D.Run(); GPU.GPU3D.Run();
if (ARM9.MRTrack.Type == MainRAMType::Null)
{
if (CPUStop & CPUStop_GXStall) if (CPUStop & CPUStop_GXStall)
{ {
// GXFIFO stall // GXFIFO stall
s32 cycles = GPU.GPU3D.CyclesToRunFor(); s32 cycles = GPU.GPU3D.CyclesToRunFor();
DMA9Timestamp = std::min(ARM9Target, std::max(ARM9Timestamp+(cycles<<ARM9ClockShift), DMA9Timestamp+(cycles<<ARM9ClockShift))); DMA9Timestamp = std::min(ARM9Target, std::max(ARM9Timestamp, DMA9Timestamp)+(cycles<<ARM9ClockShift));
} }
else if (CPUStop & CPUStop_DMA9) else if (ARM9.MRTrack.Type == MainRAMType::Null)
{
if (CPUStop & CPUStop_DMA9)
{ {
DMAs[0].Run(); DMAs[0].Run();
if (!(CPUStop & CPUStop_GXStall) && (ARM9.MRTrack.Type == MainRAMType::Null)) DMAs[1].Run(); if (!(CPUStop & CPUStop_GXStall) && (ARM9.MRTrack.Type == MainRAMType::Null)) DMAs[1].Run();