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

handle swp instruction aborts

This commit is contained in:
Jaklyy 2024-06-05 14:31:44 -04:00
parent 1871c48849
commit 7c3108e20f
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/ARMInterpreter_LoadStore.cpp
View File

@ -382,13 +382,16 @@ void A_SWP(ARM* cpu)
u32 rm = cpu->R[cpu->CurInstr & 0xF]; u32 rm = cpu->R[cpu->CurInstr & 0xF];
u32 val; u32 val;
cpu->DataRead32(base, &val); if (cpu->DataRead32(base, &val))
cpu->R[(cpu->CurInstr >> 12) & 0xF] = ROR(val, 8*(base&0x3)); {
u32 numD = cpu->DataCycles; u32 numD = cpu->DataCycles;
cpu->DataWrite32(base, rm); if (cpu->DataWrite32(base, rm))
{
// rd only gets updated if both read and write succeed
cpu->R[(cpu->CurInstr >> 12) & 0xF] = ROR(val, 8*(base&0x3));
}
cpu->DataCycles += numD; cpu->DataCycles += numD;
}
cpu->AddCycles_CDI(); cpu->AddCycles_CDI();
} }
@ -397,12 +400,17 @@ void A_SWPB(ARM* cpu)
u32 base = cpu->R[(cpu->CurInstr >> 16) & 0xF]; u32 base = cpu->R[(cpu->CurInstr >> 16) & 0xF];
u32 rm = cpu->R[cpu->CurInstr & 0xF] & 0xFF; u32 rm = cpu->R[cpu->CurInstr & 0xF] & 0xFF;
cpu->DataRead8(base, &cpu->R[(cpu->CurInstr >> 12) & 0xF]); u32 val;
if (cpu->DataRead8(base, &val))
{
u32 numD = cpu->DataCycles; u32 numD = cpu->DataCycles;
cpu->DataWrite8(base, rm); if (cpu->DataWrite8(base, rm))
{
// rd only gets updated if both read and write succeed
cpu->R[(cpu->CurInstr >> 12) & 0xF] = val;
}
cpu->DataCycles += numD; cpu->DataCycles += numD;
}
cpu->AddCycles_CDI(); cpu->AddCycles_CDI();
} }