piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-25 23:29:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

improve data aborts for ldm

Browse Source
This commit is contained in:
Jaklyy
2024-06-02 00:11:01 -04:00
parent 065573f316
commit 960f063eaa
1 changed files with 52 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/ARMInterpreter_LoadStore.cpp
View File

@ -397,6 +397,7 @@ void A_LDM(ARM* cpu)
u32 wbbase; u32 wbbase;
u32 preinc = (cpu->CurInstr & (1<<24)); u32 preinc = (cpu->CurInstr & (1<<24));
bool first = true; bool first = true;
int abortreg = 16;
if (!(cpu->CurInstr & (1<<23))) if (!(cpu->CurInstr & (1<<23)))
{ {
@ -415,10 +416,32 @@ void A_LDM(ARM* cpu)
preinc = !preinc; preinc = !preinc;
} }
// check for data aborts
if (cpu->Num == 0)
{
u32 tmpbase = base;
for (int i = 0; i < 16; i++)
{
if (cpu->CurInstr & (1<<i))
{
if (preinc) tmpbase += 4;
if(((ARMv5*)cpu)->PU_Map[tmpbase>>12] & 0x01)
{
if (!preinc) tmpbase += 4;
}
else
{
abortreg = i;
break;
}
}
}
}
if ((cpu->CurInstr & (1<<22)) && !(cpu->CurInstr & (1<<15))) if ((cpu->CurInstr & (1<<22)) && !(cpu->CurInstr & (1<<15)))
cpu->UpdateMode(cpu->CPSR, (cpu->CPSR&~0x1F)|0x10, true); cpu->UpdateMode(cpu->CPSR, (cpu->CPSR&~0x1F)|0x10, true);
for (int i = 0; i < 15; i++) for (int i = 0; i < std::min(15, abortreg); i++)
{ {
if (cpu->CurInstr & (1<<i)) if (cpu->CurInstr & (1<<i))
{ {
@ -429,9 +452,9 @@ void A_LDM(ARM* cpu)
if (!preinc) base += 4; if (!preinc) base += 4;
} }
} }
u32 pc; u32 pc;
if (cpu->CurInstr & (1<<15)) if ((cpu->CurInstr & (1<<15)) && (abortreg == 16))
{ {
if (preinc) base += 4; if (preinc) base += 4;
if (first) cpu->DataRead32 (base, &pc); if (first) cpu->DataRead32 (base, &pc);
@ -445,27 +468,35 @@ void A_LDM(ARM* cpu)
if ((cpu->CurInstr & (1<<22)) && !(cpu->CurInstr & (1<<15))) if ((cpu->CurInstr & (1<<22)) && !(cpu->CurInstr & (1<<15)))
cpu->UpdateMode((cpu->CPSR&~0x1F)|0x10, cpu->CPSR, true); cpu->UpdateMode((cpu->CPSR&~0x1F)|0x10, cpu->CPSR, true);
if (cpu->CurInstr & (1<<21)) // if it's 16 then there was no data abort
if (abortreg == 16)
{ {
// post writeback if (cpu->CurInstr & (1<<21))
if (cpu->CurInstr & (1<<23))
wbbase = base;
if (cpu->CurInstr & (1 << baseid))
{ {
if (cpu->Num == 0) // post writeback
{ if (cpu->CurInstr & (1<<23))
u32 rlist = cpu->CurInstr & 0xFFFF; wbbase = base;
if ((!(rlist & ~(1 << baseid))) || (rlist & ~((2 << baseid) - 1)))
cpu->R[baseid] = wbbase;
}
}
else
cpu->R[baseid] = wbbase;
}
if (cpu->CurInstr & (1<<15)) if (cpu->CurInstr & (1 << baseid))
cpu->JumpTo(pc, cpu->CurInstr & (1<<22)); {
if (cpu->Num == 0)
{
u32 rlist = cpu->CurInstr & 0xFFFF;
if ((!(rlist & ~(1 << baseid))) || (rlist & ~((2 << baseid) - 1)))
cpu->R[baseid] = wbbase;
}
}
else
cpu->R[baseid] = wbbase;
}
if (cpu->CurInstr & (1<<15))
cpu->JumpTo(pc, cpu->CurInstr & (1<<22));
}
else
{
((ARMv5*)cpu)->DataAbort();
}
cpu->AddCycles_CDI(); cpu->AddCycles_CDI();
} }