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

fix some more tests

This commit is contained in:
Jaklyy 2024-11-03 09:50:58 -05:00
parent ca1fb2bc9e
commit dfd2512c20
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ARM.cpp
View File

@ -213,6 +213,8 @@ void ARMv5::Reset()
WBWritePointer = 16; WBWritePointer = 16;
WBFillPointer = 0; WBFillPointer = 0;
WBDelay = 0; WBDelay = 0;
WBTimestamp = 0;
WBLastRegion = Mem9_Null;
WBWriting = false; WBWriting = false;
ARM::Reset(); ARM::Reset();

2
src/ARM.h
View File

@ -392,7 +392,7 @@ public:
*/ */
void ICacheInvalidateAll(); void ICacheInvalidateAll();
template <bool force> inline bool WriteBufferHandle(); template <int force> inline bool WriteBufferHandle();
template <bool next> void WriteBufferCheck(); template <bool 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();

10
src/CP15.cpp
View File

@ -1156,7 +1156,7 @@ bool ARMv5::IsAddressDCachable(const u32 addr) const
return PU_Map[addr >> CP15_MAP_ENTRYSIZE_LOG2] & CP15_MAP_DCACHEABLE; return PU_Map[addr >> CP15_MAP_ENTRYSIZE_LOG2] & CP15_MAP_DCACHEABLE;
} }
template <bool force> template <int force>
inline bool ARMv5::WriteBufferHandle() inline bool ARMv5::WriteBufferHandle()
{ {
// handle write buffer writes // handle write buffer writes
@ -1215,7 +1215,6 @@ inline bool ARMv5::WriteBufferHandle()
if ( force && ts > NDS.ARM9Timestamp) if ( force && ts > NDS.ARM9Timestamp)
{ {
NDS.ARM9Timestamp = ts; NDS.ARM9Timestamp = ts;
DataCycles = 0; // checkme
} }
WBTimestamp = ts; WBTimestamp = ts;
@ -1242,6 +1241,7 @@ inline bool ARMv5::WriteBufferHandle()
WBLastRegion = NDS.ARM9Regions[WBCurAddr>>14]; WBLastRegion = NDS.ARM9Regions[WBCurAddr>>14];
//printf("writing: adr: %i, val: %lli, cyl: %i", WBCurAddr, WBCurVal, WBCurCycles); //printf("writing: adr: %i, val: %lli, cyl: %i", WBCurAddr, WBCurVal, WBCurCycles);
WBWriting = false; WBWriting = false;
if constexpr (force == 2) return true;
} }
// check if write buffer is empty // check if write buffer is empty
@ -1281,9 +1281,9 @@ void ARMv5::WriteBufferCheck()
if constexpr (next) // check if the next write is occuring if constexpr (next) // check if the next write is occuring
{ {
if (NDS.ARM9Timestamp > WBTimestamp) if (NDS.ARM9Timestamp >= WBTimestamp)
{ {
WriteBufferHandle<true>(); while(!WriteBufferHandle<2>());
} }
} }
} }
@ -1299,7 +1299,7 @@ void ARMv5::WriteBufferWrite(u32 val, u8 flag, u32 addr)
else if (WBWritePointer == 16) // indicates empty write buffer else if (WBWritePointer == 16) // indicates empty write buffer
{ {
WBWritePointer = 0; WBWritePointer = 0;
WBTimestamp = NDS.ARM9Timestamp + 1; if (WBTimestamp < (NDS.ARM9Timestamp + 1)) WBTimestamp = NDS.ARM9Timestamp + 1;
} }
WriteBufferFifo[WBFillPointer] = val | (u64)flag << 61; WriteBufferFifo[WBFillPointer] = val | (u64)flag << 61;