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

actually no it was not more correct 

undo previous commit because actually code cycles *do* matter
This commit is contained in:
Jaklyy 2024-07-07 15:41:14 -04:00
parent 383750692e
commit e2be0b4f93
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ARM.cpp
View File

@ -1262,7 +1262,7 @@ bool ARMv4::DataWrite32S(u32 addr, u32 val, bool dataabort)
void ARMv5::AddCycles_CD_STR() void ARMv5::AddCycles_CD_STR()
{ {
s32 numC = CodeCycles; s32 numC = (R[15] & 0x2) ? 0 : CodeCycles;
s32 numD = DataCycles + CyclesILed; s32 numD = DataCycles + CyclesILed;
s32 early; s32 early;
@ -1287,7 +1287,7 @@ void ARMv5::AddCycles_CD_STR()
void ARMv5::AddCycles_CD_STM() void ARMv5::AddCycles_CD_STM()
{ {
s32 numC = CodeCycles; s32 numC = (R[15] & 0x2) ? 0 : CodeCycles;
s32 numD = DataCycles + CyclesILed; s32 numD = DataCycles + CyclesILed;
s32 early; s32 early;
@ -1313,7 +1313,7 @@ void ARMv5::AddCycles_CD_STM()
void ARMv5::AddCycles_CDI_LDR() void ARMv5::AddCycles_CDI_LDR()
{ {
// LDR cycles. ARM9 seems to skip the internal cycle here. // LDR cycles. ARM9 seems to skip the internal cycle here.
s32 numC = CodeCycles; s32 numC = (R[15] & 0x2) ? 0 : CodeCycles;
s32 numD = DataCycles + CyclesILed; s32 numD = DataCycles + CyclesILed;
// if a 32 bit bus, start 2 cycles early; else, start 4 cycles early // if a 32 bit bus, start 2 cycles early; else, start 4 cycles early
@ -1340,7 +1340,7 @@ void ARMv5::AddCycles_CDI_LDR()
void ARMv5::AddCycles_CDI_LDM() void ARMv5::AddCycles_CDI_LDM()
{ {
// LDM cycles. ARM9 seems to skip the internal cycle here. // LDM cycles. ARM9 seems to skip the internal cycle here.
s32 numC = CodeCycles; s32 numC = (R[15] & 0x2) ? 0 : CodeCycles;
s32 numD = DataCycles + CyclesILed; s32 numD = DataCycles + CyclesILed;
// if a 32 bit bus, start 2 cycles early; else, start 4 cycles early // if a 32 bit bus, start 2 cycles early; else, start 4 cycles early