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

clean up a few errors

This commit is contained in:
Jaklyy 2024-12-17 23:29:47 -05:00
parent 6ef7a337cb
commit 4a598294a5
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CP15.cpp
View File

@ -2967,7 +2967,7 @@ void ARMv5::DWrite16_3()
else
{
NDS.ARM9Timestamp += MemTimings[addr >> 14][0];
DataCycles = NDS.ARM9ClockShift;
DataCycles = 3<<NDS.ARM9ClockShift;
DataRegion = NDS.ARM9Regions[addr>>14];
if (WBTimestamp < ((NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1)))
@ -3197,7 +3197,7 @@ void ARMv5::DWrite32S_3()
}
else
{
NDS.ARM9Timestamp += DataCycles = MemTimings[addr>>14][2];
NDS.ARM9Timestamp += MemTimings[addr>>14][2];
DataRegion = NDS.ARM9Regions[addr>>14];
if (WBTimestamp < ((NDS.ARM9Timestamp + ((1<<NDS.ARM9ClockShift)-1)) & ~((1<<NDS.ARM9ClockShift)-1)))

7
src/NDS.cpp
View File

@ -932,7 +932,7 @@ void NDS::MainRAMHandleARM9()
{
A9ContentionTS += 2;
MainRAMTimestamp += 2;
ARM9.DataCycles = 2 << ARM9ClockShift;
if (!(var & MRWrite)) ARM9.DataCycles = 2 << ARM9ClockShift;
}
else
{
@ -940,7 +940,7 @@ void NDS::MainRAMHandleARM9()
MainRAMBork = !(var & MRWrite) && ((addr & 0x1F) >= 0x1A);
MainRAMTimestamp = A9ContentionTS + ((var & MR16) ? 8 : 9); // checkme: are these correct for 8bit?
if (var & MRWrite) A9ContentionTS += ((var & MR16) ? 5 : 6); // checkme: is this correct for 133mhz?
if (var & MRWrite) A9ContentionTS += ((var & MR16) ? 6 : 7); // checkme: is this correct for 133mhz?
else
{
if (ARM9ClockShift == 1) A9ContentionTS += ((var & MR16) ? 8 : 9);
@ -958,6 +958,7 @@ void NDS::MainRAMHandleARM9()
}
else
{
ARM9.DataRegion = Mem9_MainRAM;
u8 reg = ARM9.MRTrack.Progress;
u32 addr = ARM9.FetchAddr[reg];
if (var & MRWrite) // write
@ -1051,6 +1052,8 @@ void NDS::MainRAMHandleARM9()
(*prog)++;
if (*prog >= 8)
{
ARM9.DataRegion = Mem9_MainRAM;
ARM9.DataCycles = 3 << ARM9ClockShift;
ARM9.RetVal = dcache[(ARM9.FetchAddr[16] & 0x1F) / 4];
memset(&ARM9.MRTrack, 0, sizeof(ARM9.MRTrack));
ConTSLock = false;