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

add back faster prefetch for ARM9

This commit is contained in:
StapleButter 2018-12-11 16:41:18 +01:00
parent beb092f93e
commit 91b2f64596
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ARM.cpp
View File

@ -144,7 +144,10 @@ void ARM::SetupCodeMem(u32 addr)
} }
else else
{ {
NDS::ARM7GetMemRegion(addr, false, &CodeMem); // not sure it's worth it for the ARM7
// esp. as everything there generally runs on WRAM
// and due to how it's mapped, we can't use this optimization
//NDS::ARM7GetMemRegion(addr, false, &CodeMem);
} }
} }
@ -176,7 +179,7 @@ void ARMv5::JumpTo(u32 addr, bool restorecpsr)
addr &= ~0x1; addr &= ~0x1;
R[15] = addr+2; R[15] = addr+2;
//if (newregion != oldregion) SetupCodeMem(addr); if (newregion != oldregion) SetupCodeMem(addr);
// two-opcodes-at-once fetch // two-opcodes-at-once fetch
// doesn't matter if we put garbage in the MSbs there // doesn't matter if we put garbage in the MSbs there
@ -200,7 +203,7 @@ void ARMv5::JumpTo(u32 addr, bool restorecpsr)
addr &= ~0x3; addr &= ~0x3;
R[15] = addr+4; R[15] = addr+4;
//if (newregion != oldregion) SetupCodeMem(addr); if (newregion != oldregion) SetupCodeMem(addr);
NextInstr[0] = CodeRead32(addr); NextInstr[0] = CodeRead32(addr);
NextInstr[1] = CodeRead32(addr+4); NextInstr[1] = CodeRead32(addr+4);

2
src/CP15.cpp
View File

@ -514,6 +514,8 @@ u32 ARMv5::CodeRead32(u32 addr)
return *(u32*)&ITCM[addr & 0x7FFF]; return *(u32*)&ITCM[addr & 0x7FFF];
} }
if (CodeMem.Mem) return *(u32*)&CodeMem.Mem[addr & CodeMem.Mask];
return NDS::ARM9Read32(addr); return NDS::ARM9Read32(addr);
} }