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

fix main ram timestamp 

i hate order of operations
This commit is contained in:
Jaklyy 2024-12-08 10:02:25 -05:00
parent e69a2aa1b5
commit 8209fdebb4
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/NDS.cpp
View File

@ -936,12 +936,12 @@ void NDS::MainRAMHandleARM9()
{ {
if (A9ContentionTS < MainRAMTimestamp) { A9ContentionTS = MainRAMTimestamp; if (A7PRIORITY) return; } if (A9ContentionTS < MainRAMTimestamp) { A9ContentionTS = MainRAMTimestamp; if (A7PRIORITY) return; }
MainRAMTimestamp = A9ContentionTS + (var & MR16) ? 8 : 9; // checkme: are these correct for 8bit? 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) ? 5 : 6); // checkme: is this correct for 133mhz?
else else
{ {
if (ARM9ClockShift == 1) A9ContentionTS += (var & MR16) ? 8 : 9; if (ARM9ClockShift == 1) A9ContentionTS += ((var & MR16) ? 8 : 9);
else A9ContentionTS += (var & MR16) ? 7 : 8; else A9ContentionTS += ((var & MR16) ? 7 : 8);
ARM9.DataCycles = 3 << ARM9ClockShift; ARM9.DataCycles = 3 << ARM9ClockShift;
} }
MainRAMLastAccess = A9LAST; MainRAMLastAccess = A9LAST;
@ -967,7 +967,7 @@ void NDS::MainRAMHandleARM9()
else // read else // read
{ {
u32 dummy; u32 dummy;
u32* val = (ARM9.LDRFailedRegs & (1<<reg)) ? &dummy : &ARM9.R[reg]; u32* val = ((ARM9.LDRFailedRegs & (1<<reg)) ? &dummy : &ARM9.R[reg]);
if (var & MR32) *val = ARM9Read32(addr); if (var & MR32) *val = ARM9Read32(addr);
else if (var & MR16) *val = ARM9Read16(addr); else if (var & MR16) *val = ARM9Read16(addr);
else *val = ARM9Read8 (addr); else *val = ARM9Read8 (addr);
@ -1001,7 +1001,7 @@ void NDS::MainRAMHandleARM9()
if (A9ContentionTS < MainRAMTimestamp) { A9ContentionTS = MainRAMTimestamp; if (A7PRIORITY) return; } if (A9ContentionTS < MainRAMTimestamp) { A9ContentionTS = MainRAMTimestamp; if (A7PRIORITY) return; }
MainRAMTimestamp = A9ContentionTS + 9; MainRAMTimestamp = A9ContentionTS + 9;
A9ContentionTS += (ARM9ClockShift == 1) ? 9 : 8; A9ContentionTS += ((ARM9ClockShift == 1) ? 9 : 8);
MainRAMLastAccess = A9LAST; MainRAMLastAccess = A9LAST;
} }
@ -1036,7 +1036,7 @@ void NDS::MainRAMHandleARM9()
if (A9ContentionTS < MainRAMTimestamp) { A9ContentionTS = MainRAMTimestamp; if (A7PRIORITY) return; } if (A9ContentionTS < MainRAMTimestamp) { A9ContentionTS = MainRAMTimestamp; if (A7PRIORITY) return; }
MainRAMTimestamp = A9ContentionTS + 9; MainRAMTimestamp = A9ContentionTS + 9;
A9ContentionTS += (ARM9ClockShift == 1) ? 9 : 8; A9ContentionTS += ((ARM9ClockShift == 1) ? 9 : 8);
MainRAMLastAccess = A9LAST; MainRAMLastAccess = A9LAST;
} }
@ -1158,23 +1158,25 @@ void NDS::MainRAMHandleARM7()
if ((var & MRSequential) && A7WENTLAST) if ((var & MRSequential) && A7WENTLAST)
{ {
int cycles = (var & MR32) ? 2 : 1; int cycles = ((var & MR32) ? 2 : 1);
MainRAMTimestamp = ARM7Timestamp += cycles; MainRAMTimestamp += cycles;
ARM7Timestamp += cycles;
//printf("%lli %lli\n", MainRAMTimestamp, ARM7Timestamp);
} }
else else
{ {
if (ARM7Timestamp < MainRAMTimestamp) { ARM7Timestamp = MainRAMTimestamp; if (A9PRIORITY) return; } if (ARM7Timestamp < MainRAMTimestamp) { ARM7Timestamp = MainRAMTimestamp; if (A9PRIORITY) return; }
MainRAMTimestamp = ARM7Timestamp + (var & MR16) ? 8 : 9; // checkme: are these correct for 8bit? MainRAMTimestamp = ARM7Timestamp + ((var & MR16) ? 8 : 9); // checkme: are these correct for 8bit?
if (var & MRWrite) ARM7Timestamp += (var & MR16) ? 3 : 4; if (var & MRWrite) ARM7Timestamp += ((var & MR16) ? 3 : 4);
else ARM7Timestamp += (var & MR16) ? 5 : 6; else ARM7Timestamp += ((var & MR16) ? 5 : 6);
MainRAMLastAccess = A7LAST; MainRAMLastAccess = A7LAST;
} }
if (var & MRCodeFetch) if (var & MRCodeFetch)
{ {
u32 addr = ARM7.FetchAddr[16]; u32 addr = ARM7.FetchAddr[16];
ARM7.RetVal = (var & MR32) ? ARM7Read32(addr) : ARM7Read16(addr); ARM7.RetVal = (((var & MR32) ? ARM7Read32(addr) : ARM7Read16(addr)));
} }
else else
{ {
@ -1190,7 +1192,7 @@ void NDS::MainRAMHandleARM7()
else // read else // read
{ {
u32 dummy; u32 dummy;
u32* val = (ARM7.LDRFailedRegs & (1<<reg)) ? &dummy : &ARM7.R[reg]; u32* val = ((ARM7.LDRFailedRegs & (1<<reg)) ? &dummy : &ARM7.R[reg]);
if (var & MR32) *val = ARM7Read32(addr); if (var & MR32) *val = ARM7Read32(addr);
else if (var & MR16) *val = ARM7Read16(addr); else if (var & MR16) *val = ARM7Read16(addr);
else *val = ARM7Read8 (addr); else *val = ARM7Read8 (addr);