1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-03-06 21:00:31 +01:00

fix fixed src main ram dma timings being off by 1

This commit is contained in:
Jaklyy 2024-12-23 19:31:45 -05:00
parent 8d94384907
commit 01ba503373

View file

@ -1115,12 +1115,12 @@ void NDS::MainRAMHandleARM9()
if (burststart == 2 || dma->SrcAddrInc <= 0)
{
A9ContentionTS += ARM9MemTimings[srcaddr>>14][6] + ((burststart == 2) && (ARM9MemTimings[srcaddr>>14][6] == 1));
MainRAMTimestamp += ARM9MemTimings[srcaddr>>14][6] + ((burststart == 2) && (ARM9MemTimings[srcaddr>>14][6] == 1));
MainRAMTimestamp += ARM9MemTimings[srcaddr>>14][6] - 1 + ((burststart == 2) && (ARM9MemTimings[srcaddr>>14][6] == 1));
}
else
{
A9ContentionTS += ARM9MemTimings[srcaddr>>14][7];
MainRAMTimestamp += ARM9MemTimings[srcaddr>>14][7];
MainRAMTimestamp += ARM9MemTimings[srcaddr>>14][7] - 1;
}
DMALastWasMainRAM = false;
}
@ -1221,12 +1221,12 @@ void NDS::MainRAMHandleARM9()
if (burststart == 2 || dma->SrcAddrInc <= 0)
{
A9ContentionTS += ARM9MemTimings[srcaddr>>14][4] + ((burststart == 2) && (ARM9MemTimings[srcaddr>>14][4] == 1));
MainRAMTimestamp += ARM9MemTimings[srcaddr>>14][4] + ((burststart == 2) && (ARM9MemTimings[srcaddr>>14][4] == 1));
MainRAMTimestamp += ARM9MemTimings[srcaddr>>14][4] - 1 + ((burststart == 2) && (ARM9MemTimings[srcaddr>>14][4] == 1));
}
else
{
A9ContentionTS += ARM9MemTimings[srcaddr>>14][5];
MainRAMTimestamp += ARM9MemTimings[srcaddr>>14][5];
MainRAMTimestamp += ARM9MemTimings[srcaddr>>14][5] - 1;
}
DMALastWasMainRAM = false;
}