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

write buffer shouldn't continue resolving main ram accesses if it passes the a7 ts

This commit is contained in:
Jaklyy 2024-12-08 09:05:33 -05:00
parent 68b4d96f0d
commit e69a2aa1b5
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CP15.cpp
View File

@ -1182,6 +1182,8 @@ bool ARMv5::WriteBufferHandle()
{
if (NDS.ARM9Regions[WBCurAddr>>14] == Mem9_MainRAM)
{
if (A7PRIORITY) { if (NDS.A9ContentionTS >= NDS.ARM7Timestamp) return false; }
else { if (NDS.A9ContentionTS > NDS.ARM7Timestamp) return false; }
if (NDS.A9ContentionTS < NDS.MainRAMTimestamp) { NDS.A9ContentionTS = NDS.MainRAMTimestamp; if (A7PRIORITY) return false; }
cycles = 4;
NDS.MainRAMTimestamp = NDS.A9ContentionTS + 9;
@ -1194,6 +1196,8 @@ bool ARMv5::WriteBufferHandle()
{
if (NDS.ARM9Regions[WBCurAddr>>14] == Mem9_MainRAM)
{
if (A7PRIORITY) { if (NDS.A9ContentionTS >= NDS.ARM7Timestamp) return false; }
else { if (NDS.A9ContentionTS > NDS.ARM7Timestamp) return false; }
if (NDS.A9ContentionTS < NDS.MainRAMTimestamp) { NDS.A9ContentionTS = NDS.MainRAMTimestamp; if (A7PRIORITY) return false; }
NDS.MainRAMTimestamp = NDS.A9ContentionTS + 8;
cycles = 3;
@ -1206,6 +1210,8 @@ bool ARMv5::WriteBufferHandle()
{
if (NDS.ARM9Regions[WBCurAddr>>14] == Mem9_MainRAM)
{
if (A7PRIORITY) { if (NDS.A9ContentionTS >= NDS.ARM7Timestamp) return false; }
else { if (NDS.A9ContentionTS > NDS.ARM7Timestamp) return false; }
if (A9WENTLAST)
{
NDS.MainRAMTimestamp += 2;
@ -1223,6 +1229,8 @@ bool ARMv5::WriteBufferHandle()
{
if (NDS.ARM9Regions[WBCurAddr>>14] == Mem9_MainRAM)
{
if (A7PRIORITY) { if (NDS.A9ContentionTS >= NDS.ARM7Timestamp) return false; }
else { if (NDS.A9ContentionTS > NDS.ARM7Timestamp) return false; }
if (NDS.A9ContentionTS < NDS.MainRAMTimestamp) { NDS.A9ContentionTS = NDS.MainRAMTimestamp; if (A7PRIORITY) return false; }
NDS.MainRAMTimestamp = NDS.A9ContentionTS + 9;
cycles = 4;