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

writing to the write buffer seems to require bus cycle alignment

This commit is contained in:
Jaklyy 2024-10-09 19:00:01 -04:00
parent 746f6edb0a
commit 2c3ef9f903
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CP15.cpp
View File

@ -1297,7 +1297,8 @@ bool ARMv5::DataWrite8(u32 addr, u8 val)
} }
else else
{ {
DataCycles = 2; NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
DataCycles = 1;
WriteBufferWrite(addr, 3, 1); WriteBufferWrite(addr, 3, 1);
WriteBufferWrite(val, 0, MemTimings[addr >> 12][1], addr); WriteBufferWrite(val, 0, MemTimings[addr >> 12][1], addr);
} }
@ -1356,7 +1357,8 @@ bool ARMv5::DataWrite16(u32 addr, u16 val)
} }
else else
{ {
DataCycles = 2; NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
DataCycles = 1;
WriteBufferWrite(addr, 3, 1); WriteBufferWrite(addr, 3, 1);
WriteBufferWrite(val, 1, MemTimings[addr >> 12][1], addr); WriteBufferWrite(val, 1, MemTimings[addr >> 12][1], addr);
} }
@ -1415,7 +1417,8 @@ bool ARMv5::DataWrite32(u32 addr, u32 val)
} }
else else
{ {
DataCycles = 2; NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
DataCycles = 1;
WriteBufferWrite(addr, 3, 1); WriteBufferWrite(addr, 3, 1);
WriteBufferWrite(val, 2, MemTimings[addr >> 12][2], addr); WriteBufferWrite(val, 2, MemTimings[addr >> 12][2], addr);
} }
@ -1456,7 +1459,7 @@ bool ARMv5::DataWrite32S(u32 addr, u32 val)
return true; return true;
} }
DataCycles += ((NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1)) - NDS.ARM9Timestamp); DataCycles += (((NDS.ARM9Timestamp + DataCycles) + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1)) - (NDS.ARM9Timestamp + DataCycles));
if (!(addr & 0x3FF)) return DataWrite32(addr, val); // bursts cannot cross a 1kb boundary if (!(addr & 0x3FF)) return DataWrite32(addr, val); // bursts cannot cross a 1kb boundary
@ -1473,6 +1476,7 @@ bool ARMv5::DataWrite32S(u32 addr, u32 val)
} }
else else
{ {
DataCycles += (((NDS.ARM9Timestamp + DataCycles) + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1)) - (NDS.ARM9Timestamp + DataCycles));
DataCycles += 1; DataCycles += 1;
WriteBufferWrite(val, 2, MemTimings[addr >> 12][3], addr); WriteBufferWrite(val, 2, MemTimings[addr >> 12][3], addr);
} }