piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2024-11-14 13:27:41 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

slightly cleaner code

Browse Source
This commit is contained in:
Jaklyy 2024-06-02 19:34:29 -04:00
parent b5c1ee33fb
commit 5e760a1536
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/ARMInterpreter_LoadStore.cpp
View File

@ -427,8 +427,13 @@ void A_LDM(ARM* cpu)
if (cpu->CurInstr & (1<<i)) if (cpu->CurInstr & (1<<i))
{ {
if (preinc) base += 4; if (preinc) base += 4;
if (first) {if (!cpu->DataRead32 (base, &cpu->R[i])) {dataabort = true; goto abortjump;}} if (!(first ? cpu->DataRead32 (base, &cpu->R[i])
else if (!cpu->DataRead32S(base, &cpu->R[i])) {dataabort = true; goto abortjump;} : cpu->DataRead32S(base, &cpu->R[i])))
{
dataabort = true;
goto abortjump;
}
first = false; first = false;
if (!preinc) base += 4; if (!preinc) base += 4;
} }
@ -438,8 +443,12 @@ void A_LDM(ARM* cpu)
if ((cpu->CurInstr & (1<<15))) if ((cpu->CurInstr & (1<<15)))
{ {
if (preinc) base += 4; if (preinc) base += 4;
if (first) {if (!cpu->DataRead32 (base, &pc)) dataabort = true;} if (!(first ? cpu->DataRead32 (base, &pc)
else if (!cpu->DataRead32S(base, &pc)) dataabort = true; : cpu->DataRead32S(base, &pc)))
{
dataabort = true;
}
if (!preinc) base += 4; if (!preinc) base += 4;
if (cpu->Num == 1) if (cpu->Num == 1)
@ -524,15 +533,21 @@ void A_STM(ARM* cpu)
{ {
if (preinc) base += 4; if (preinc) base += 4;
u32 val;
if (i == baseid && !isbanked) if (i == baseid && !isbanked)
{ {
if ((cpu->Num == 0) || (!(cpu->CurInstr & ((1<<i)-1)))) if ((cpu->Num == 0) || (!(cpu->CurInstr & ((1<<i)-1))))
{if (!(first ? cpu->DataWrite32(base, oldbase) : cpu->DataWrite32S(base, oldbase))) {dataabort = true; break;}} val = oldbase;
else else val = base;
if (!(first ? cpu->DataWrite32(base, base) : cpu->DataWrite32S(base, base))) {dataabort = true; break;} // checkme }
else val = cpu->R[i];
if (!(first ? cpu->DataWrite32 (base, val)
: cpu->DataWrite32S(base, val)))
{
dataabort = true;
break;
} }
else
if (!(first ? cpu->DataWrite32(base, cpu->R[i]) : cpu->DataWrite32S(base, cpu->R[i]))) {dataabort = true; break;}
first = false; first = false;