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

improved...?

This commit is contained in:
Jaklyy 2024-11-03 11:24:58 -05:00
parent 8a857f1257
commit a662af908d
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ARM.h
View File

@ -393,7 +393,7 @@ public:
void ICacheInvalidateAll(); void ICacheInvalidateAll();
template <int force> inline bool WriteBufferHandle(); template <int force> inline bool WriteBufferHandle();
template <bool next> void WriteBufferCheck(); template <int next> void WriteBufferCheck();
void WriteBufferWrite(u32 val, u8 flag, u32 addr = 0); void WriteBufferWrite(u32 val, u8 flag, u32 addr = 0);
void WriteBufferDrain(); void WriteBufferDrain();

43
src/CP15.cpp
View File

@ -1217,7 +1217,7 @@ inline bool ARMv5::WriteBufferHandle()
NDS.ARM9Timestamp = ts; NDS.ARM9Timestamp = ts;
} }
WBTimestamp = ts; WBTimestamp = (ts + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1);
if (NDS.ARM9Regions[WBCurAddr>>14] == Mem9_MainRAM) MainRAMTimestamp = ts + ((((WBCurVal >> 61) == 0) ? 4 : 5) << NDS.ARM9ClockShift); if (NDS.ARM9Regions[WBCurAddr>>14] == Mem9_MainRAM) MainRAMTimestamp = ts + ((((WBCurVal >> 61) == 0) ? 4 : 5) << NDS.ARM9ClockShift);
else WBTimestamp += 2; // todo: twl timings else WBTimestamp += 2; // todo: twl timings
@ -1274,32 +1274,37 @@ inline bool ARMv5::WriteBufferHandle()
return false; return false;
} }
template <bool next> template <int next>
void ARMv5::WriteBufferCheck() void ARMv5::WriteBufferCheck()
{ {
while (!WriteBufferHandle<false>()); // loop until we've cleared out all writeable entries while (!WriteBufferHandle<0>()); // loop until we've cleared out all writeable entries
if constexpr (next) // check if the next write is occuring if constexpr (next == 1) // check if the next write is occuring
{ {
if (NDS.ARM9Timestamp >= WBTimestamp) if (NDS.ARM9Timestamp >= WBTimestamp)
{ {
while(!WriteBufferHandle<2>()); while(!WriteBufferHandle<2>());
} }
} }
else if constexpr (next == 2)
{
while(!WriteBufferHandle<2>());
}
} }
template void ARMv5::WriteBufferCheck<true>(); template void ARMv5::WriteBufferCheck<2>();
template void ARMv5::WriteBufferCheck<false>(); template void ARMv5::WriteBufferCheck<1>();
template void ARMv5::WriteBufferCheck<0>();
void ARMv5::WriteBufferWrite(u32 val, u8 flag, u32 addr) void ARMv5::WriteBufferWrite(u32 val, u8 flag, u32 addr)
{ {
WriteBufferCheck<false>(); WriteBufferCheck<0>();
if (WBFillPointer == WBWritePointer) // if the write buffer is full then we stall the cpu until room is made if (WBFillPointer == WBWritePointer) // if the write buffer is full then we stall the cpu until room is made
WriteBufferHandle<true>(); WriteBufferHandle<1>();
else if (WBWritePointer == 16) // indicates empty write buffer else if (WBWritePointer == 16) // indicates empty write buffer
{ {
WBWritePointer = 0; WBWritePointer = 0;
if (WBTimestamp < (NDS.ARM9Timestamp + 1)) WBTimestamp = NDS.ARM9Timestamp + 1; if (WBTimestamp < (NDS.ARM9Timestamp + 1)) WBTimestamp = (NDS.ARM9Timestamp + 1 + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1);
} }
WriteBufferFifo[WBFillPointer] = val | (u64)flag << 61; WriteBufferFifo[WBFillPointer] = val | (u64)flag << 61;
@ -1309,7 +1314,7 @@ void ARMv5::WriteBufferWrite(u32 val, u8 flag, u32 addr)
void ARMv5::WriteBufferDrain() void ARMv5::WriteBufferDrain()
{ {
while (!WriteBufferHandle<true>()); // loop until drained fully while (!WriteBufferHandle<1>()); // loop until drained fully
} }
void ARMv5::CP15Write(u32 id, u32 val) void ARMv5::CP15Write(u32 id, u32 val)
@ -2074,7 +2079,7 @@ u32 ARMv5::CodeRead32(u32 addr, bool branch)
if (PU_Map[addr>>12] & 0x30) if (PU_Map[addr>>12] & 0x30)
WriteBufferDrain(); WriteBufferDrain();
else else
WriteBufferCheck<true>(); WriteBufferCheck<1>();
NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1); NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
@ -2162,7 +2167,7 @@ bool ARMv5::DataRead8(u32 addr, u32* val)
if (PU_Map[addr>>12] & 0x30) if (PU_Map[addr>>12] & 0x30)
WriteBufferDrain(); WriteBufferDrain();
else else
WriteBufferCheck<true>(); WriteBufferCheck<1>();
NDS.ARM9Timestamp = (NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1); NDS.ARM9Timestamp = (NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1);
@ -2245,7 +2250,7 @@ bool ARMv5::DataRead16(u32 addr, u32* val)
if (PU_Map[addr>>12] & 0x30) if (PU_Map[addr>>12] & 0x30)
WriteBufferDrain(); WriteBufferDrain();
else else
WriteBufferCheck<true>(); WriteBufferCheck<1>();
NDS.ARM9Timestamp = (NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1); NDS.ARM9Timestamp = (NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1);
@ -2328,7 +2333,7 @@ bool ARMv5::DataRead32(u32 addr, u32* val)
if (PU_Map[addr>>12] & 0x30) if (PU_Map[addr>>12] & 0x30)
WriteBufferDrain(); WriteBufferDrain();
else else
WriteBufferCheck<true>(); WriteBufferCheck<1>();
NDS.ARM9Timestamp = (NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1); NDS.ARM9Timestamp = (NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1);
@ -2406,7 +2411,7 @@ bool ARMv5::DataRead32S(u32 addr, u32* val)
if (PU_Map[addr>>12] & 0x30) // checkme if (PU_Map[addr>>12] & 0x30) // checkme
WriteBufferDrain(); WriteBufferDrain();
else else
WriteBufferCheck<true>(); WriteBufferCheck<1>();
// bursts cannot cross a 1kb boundary // bursts cannot cross a 1kb boundary
if (addr & 0x3FF) // s if (addr & 0x3FF) // s
@ -2510,7 +2515,7 @@ bool ARMv5::DataWrite8(u32 addr, u8 val)
if (!(PU_Map[addr>>12] & (0x30))) if (!(PU_Map[addr>>12] & (0x30)))
{ {
WriteBufferCheck<true>(); WriteBufferCheck<2>();
NDS.ARM9Timestamp = (NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1); NDS.ARM9Timestamp = (NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1);
@ -2600,7 +2605,7 @@ bool ARMv5::DataWrite16(u32 addr, u16 val)
if (!(PU_Map[addr>>12] & 0x30)) if (!(PU_Map[addr>>12] & 0x30))
{ {
WriteBufferCheck<true>(); WriteBufferCheck<2>();
NDS.ARM9Timestamp = (NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1); NDS.ARM9Timestamp = (NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1);
@ -2690,7 +2695,7 @@ bool ARMv5::DataWrite32(u32 addr, u32 val)
if (!(PU_Map[addr>>12] & 0x30)) if (!(PU_Map[addr>>12] & 0x30))
{ {
WriteBufferCheck<true>(); WriteBufferCheck<2>();
NDS.ARM9Timestamp = (NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1); NDS.ARM9Timestamp = (NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1);
@ -2775,7 +2780,7 @@ bool ARMv5::DataWrite32S(u32 addr, u32 val)
if (!(PU_Map[addr>>12] & 0x30)) // non-bufferable if (!(PU_Map[addr>>12] & 0x30)) // non-bufferable
{ {
WriteBufferCheck<true>(); WriteBufferCheck<2>();
// bursts cannot cross a 1kb boundary // bursts cannot cross a 1kb boundary
if (addr & 0x3FF) // s if (addr & 0x3FF) // s