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

thumb ldmia/pop data aborts

Browse Source
This commit is contained in:
Jaklyy 2024-06-06 19:05:28 -04:00
parent d6cd189455
commit 8bc7e4591c
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ARMInterpreter_LoadStore.cpp
View File

@ -825,8 +825,11 @@ void T_POP(ARM* cpu)
{ {
if (cpu->CurInstr & (1<<i)) if (cpu->CurInstr & (1<<i))
{ {
if (first) cpu->DataRead32 (base, &cpu->R[i]); if (!(first ? cpu->DataRead32 (base, &cpu->R[i])
else cpu->DataRead32S(base, &cpu->R[i]); : cpu->DataRead32S(base, &cpu->R[i])))
{
goto dataabort;
}
first = false; first = false;
base += 4; base += 4;
} }
@ -835,14 +838,19 @@ void T_POP(ARM* cpu)
if (cpu->CurInstr & (1<<8)) if (cpu->CurInstr & (1<<8))
{ {
u32 pc; u32 pc;
if (first) cpu->DataRead32 (base, &pc); if (!(first ? cpu->DataRead32 (base, &pc)
else cpu->DataRead32S(base, &pc); : cpu->DataRead32S(base, &pc)))
{
goto dataabort;
}
if (cpu->Num==1) pc |= 0x1; if (cpu->Num==1) pc |= 0x1;
cpu->JumpTo(pc); cpu->JumpTo(pc);
base += 4; base += 4;
} }
cpu->R[13] = base; cpu->R[13] = base;
dataabort:
cpu->AddCycles_CDI(); cpu->AddCycles_CDI();
} }
@ -880,8 +888,11 @@ void T_LDMIA(ARM* cpu)
{ {
if (cpu->CurInstr & (1<<i)) if (cpu->CurInstr & (1<<i))
{ {
if (first) cpu->DataRead32 (base, &cpu->R[i]); if (!(first ? cpu->DataRead32 (base, &cpu->R[i])
else cpu->DataRead32S(base, &cpu->R[i]); : cpu->DataRead32S(base, &cpu->R[i])))
{
goto dataabort;
}
first = false; first = false;
base += 4; base += 4;
} }
@ -890,6 +901,7 @@ void T_LDMIA(ARM* cpu)
if (!(cpu->CurInstr & (1<<((cpu->CurInstr >> 8) & 0x7)))) if (!(cpu->CurInstr & (1<<((cpu->CurInstr >> 8) & 0x7))))
cpu->R[(cpu->CurInstr >> 8) & 0x7] = base; cpu->R[(cpu->CurInstr >> 8) & 0x7] = base;
dataabort:
cpu->AddCycles_CDI(); cpu->AddCycles_CDI();
} }