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

fix main ram dmas not halting for higher priority dmas

This commit is contained in:
Jaklyy 2024-12-28 12:42:44 -05:00
parent a86a3f8566
commit b9472d430e
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/NDS.cpp
View File

@ -1083,6 +1083,12 @@ void NDS::MainRAMHandleARM9()
case MainRAMType::DMA32: case MainRAMType::DMA32:
{ {
if (CPUStop & ((1<<ARM9.MRTrack.Var)-1))
{
memset(&ARM9.MRTrack, 0, sizeof(ARM9.MRTrack));
break;
}
DMA* dma = &DMAs[ARM9.MRTrack.Var]; DMA* dma = &DMAs[ARM9.MRTrack.Var];
int burststart = dma->Running - 1; int burststart = dma->Running - 1;
@ -1189,6 +1195,12 @@ void NDS::MainRAMHandleARM9()
case MainRAMType::DMA16: case MainRAMType::DMA16:
{ {
if (CPUStop & ((1<<ARM9.MRTrack.Var)-1))
{
memset(&ARM9.MRTrack, 0, sizeof(ARM9.MRTrack));
break;
}
DMA* dma = &DMAs[ARM9.MRTrack.Var]; DMA* dma = &DMAs[ARM9.MRTrack.Var];
int burststart = dma->Running - 1; int burststart = dma->Running - 1;
@ -1445,6 +1457,12 @@ void NDS::MainRAMHandleARM7()
case MainRAMType::DMA32: case MainRAMType::DMA32:
{ {
if (CPUStop & CPUStop_DMA7 & ((1<<ARM7.MRTrack.Var)-1))
{
memset(&ARM7.MRTrack, 0, sizeof(ARM7.MRTrack));
break;
}
DMA* dma = &DMAs[ARM7.MRTrack.Var]; DMA* dma = &DMAs[ARM7.MRTrack.Var];
int burststart = dma->Running - 1; int burststart = dma->Running - 1;
@ -1545,6 +1563,12 @@ void NDS::MainRAMHandleARM7()
case MainRAMType::DMA16: case MainRAMType::DMA16:
{ {
if (CPUStop & CPUStop_DMA7 & ((1<<ARM7.MRTrack.Var)-1))
{
memset(&ARM7.MRTrack, 0, sizeof(ARM7.MRTrack));
break;
}
DMA* dma = &DMAs[ARM7.MRTrack.Var]; DMA* dma = &DMAs[ARM7.MRTrack.Var];
int burststart = dma->Running - 1; int burststart = dma->Running - 1;