piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-26 07:39:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

revert the *entire* interlock implemention

Browse Source 
too slow, not accurate enough.
we need to do a *lot* more research into the specifics of how this works with all the various aspects of the cpu's timings before we can make a good implementation
This commit is contained in:
Jaklyy
2024-07-11 20:06:56 -04:00
parent 1fdac1d489
commit 038ffa3a35
6 changed files with 290 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/ARM.cpp
View File

@ -190,8 +190,6 @@ void ARM::Reset()
BreakReq = false;
#endif
memset(InterlockTimestamp, 0, sizeof(InterlockTimestamp));
// zorp
JumpTo(ExceptionBase);
}
@ -695,7 +693,6 @@ void ARMv5::Execute()
NDS.ARM9Timestamp += Cycles;
Cycles = 0;
CyclesILed = 0;
}
if (Halted == 2)
@ -1262,7 +1259,7 @@ bool ARMv4::DataWrite32S(u32 addr, u32 val, bool dataabort)
void ARMv5::AddCycles_CD_STR()
{
s32 numC = (R[15] & 0x2) ? 0 : CodeCycles;
s32 numD = DataCycles + CyclesILed;
s32 numD = DataCycles;
s32 early;
if (DataRegion == Mem9_ITCM)
@ -1287,7 +1284,7 @@ void ARMv5::AddCycles_CD_STR()
void ARMv5::AddCycles_CD_STM()
{
s32 numC = (R[15] & 0x2) ? 0 : CodeCycles;
s32 numD = DataCycles + CyclesILed;
s32 numD = DataCycles;
s32 early;
if (DataRegion == Mem9_ITCM)
@ -1313,7 +1310,7 @@ void ARMv5::AddCycles_CDI_LDR()
{
// LDR cycles. ARM9 seems to skip the internal cycle here.
s32 numC = (R[15] & 0x2) ? 0 : CodeCycles;
s32 numD = DataCycles + CyclesILed;
s32 numD = DataCycles;
// if a 32 bit bus, start 2 cycles early; else, start 4 cycles early
s32 early;
@ -1340,7 +1337,7 @@ void ARMv5::AddCycles_CDI_LDM()
{
// LDM cycles. ARM9 seems to skip the internal cycle here.
s32 numC = (R[15] & 0x2) ? 0 : CodeCycles;
s32 numD = DataCycles + CyclesILed;
s32 numD = DataCycles;
// if a 32 bit bus, start 2 cycles early; else, start 4 cycles early
s32 early;
@ -1442,16 +1439,6 @@ void ARMv4::AddCycles_CD()
}
}
u64& ARMv5::Timestamp()
{
return NDS.ARM9Timestamp;
}
u64& ARMv4::Timestamp()
{
return NDS.ARM7Timestamp;
}
u8 ARMv5::BusRead8(u32 addr)
{
return NDS.ARM9Read8(addr);