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

clean up code

This commit is contained in:
Jaklyy 2024-09-23 20:03:58 -04:00
parent 3b73f21bb7
commit 7fb18b1155
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ARMInterpreter_LoadStore.cpp
View File

@ -450,30 +450,16 @@ void ReglessLDMSTM(ARM* cpu, const bool load, const u8 baseid, const bool writeb
if (load) if (load)
{ {
u32 pc; u32 pc;
if (cpu->DataRead32(base, &pc)) cpu->DataRead32(base, &pc);
{
cpu->AddCycles_CDI(); cpu->AddCycles_CDI();
cpu->JumpTo(pc, usermode); // checkme can we restore cpsr? cpu->JumpTo(pc, usermode);
} }
else else
{ {
cpu->AddCycles_CDI(); cpu->DataWrite32(base, cpu->R[15] + (thumb ? 2 : 4));
((ARMv5*)cpu)->DataAbort();
return;
}
}
else
{
if (!cpu->DataWrite32(base, cpu->R[15] + (thumb ? 2 : 4)))
{
cpu->AddCycles_CD(); cpu->AddCycles_CD();
((ARMv5*)cpu)->DataAbort();
return;
}
else
{
cpu->AddCycles_CD();
}
} }
} }
else else