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

nvmnvmnvm

This commit is contained in:
Jaklyy 2024-10-14 22:48:25 -04:00
parent 026719acef
commit 263dd20ec3
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/CP15.cpp
View File

@ -915,8 +915,9 @@ u32 ARMv5::CodeRead32(u32 addr, bool branch)
//return *(u32*)&CurICacheLine[addr & 0x1C]; //return *(u32*)&CurICacheLine[addr & 0x1C];
} }
WriteBufferDrain(); if (PU_Map[addr>>12] & 0x30)
WriteBufferDrain();
NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1); NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
@ -962,7 +963,8 @@ bool ARMv5::DataRead8(u32 addr, u32* val)
return true; return true;
} }
WriteBufferDrain(); if (PU_Map[addr>>12] & 0x30)
WriteBufferDrain();
NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1); NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
@ -1008,8 +1010,9 @@ bool ARMv5::DataRead16(u32 addr, u32* val)
*val = *(u16*)&DTCM[addr & (DTCMPhysicalSize - 1)]; *val = *(u16*)&DTCM[addr & (DTCMPhysicalSize - 1)];
return true; return true;
} }
WriteBufferDrain(); if (PU_Map[addr>>12] & 0x30)
WriteBufferDrain();
NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1); NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
@ -1055,8 +1058,9 @@ bool ARMv5::DataRead32(u32 addr, u32* val)
*val = *(u32*)&DTCM[addr & (DTCMPhysicalSize - 1)]; *val = *(u32*)&DTCM[addr & (DTCMPhysicalSize - 1)];
return true; return true;
} }
WriteBufferDrain(); if (PU_Map[addr>>12] & 0x30)
WriteBufferDrain();
NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1); NDS.ARM9Timestamp = NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1) & ~((1<<NDS.ARM9ClockShift)-1);
@ -1101,8 +1105,9 @@ bool ARMv5::DataRead32S(u32 addr, u32* val)
*val = *(u32*)&DTCM[addr & (DTCMPhysicalSize - 1)]; *val = *(u32*)&DTCM[addr & (DTCMPhysicalSize - 1)];
return true; return true;
} }
WriteBufferDrain(); if (PU_Map[addr>>12] & 0x30)
WriteBufferDrain();
NDS.ARM9Timestamp += DataCycles; NDS.ARM9Timestamp += DataCycles;