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

str r15 is incremented by +2/+4 oop

Browse Source
This commit is contained in:
Jaklyy
2024-09-23 16:12:23 -04:00
parent 8af790beee
commit 3b73f21bb7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ARMInterpreter_LoadStore.cpp
View File

@ -434,7 +434,7 @@ void A_SWPB(ARM* cpu)
SWP<true>(cpu); SWP<true>(cpu);
} }
void ReglessLDMSTM(ARM* cpu, const bool load, const u8 baseid, const bool writeback, const bool decrement, bool preinc, const bool usermode) void ReglessLDMSTM(ARM* cpu, const bool load, const u8 baseid, const bool writeback, const bool decrement, bool preinc, const bool usermode, const bool thumb)
{ {
if (cpu->Num == 1) if (cpu->Num == 1)
{ {
@ -464,7 +464,7 @@ void ReglessLDMSTM(ARM* cpu, const bool load, const u8 baseid, const bool writeb
} }
else else
{ {
if (!cpu->DataWrite32(base, cpu->R[15])) if (!cpu->DataWrite32(base, cpu->R[15] + (thumb ? 2 : 4)))
{ {
cpu->AddCycles_CD(); cpu->AddCycles_CD();
((ARMv5*)cpu)->DataAbort(); ((ARMv5*)cpu)->DataAbort();
@ -500,7 +500,7 @@ void A_LDM(ARM* cpu)
if (!(cpu->CurInstr & 0xFFFF)) [[unlikely]] if (!(cpu->CurInstr & 0xFFFF)) [[unlikely]]
{ {
ReglessLDMSTM(cpu, true, baseid, cpu->CurInstr & (1<<21), !(cpu->CurInstr & (1<<23)), preinc, cpu->CurInstr & (1<<22)); ReglessLDMSTM(cpu, true, baseid, cpu->CurInstr & (1<<21), !(cpu->CurInstr & (1<<23)), preinc, cpu->CurInstr & (1<<22), false);
return; return;
} }
@ -606,7 +606,7 @@ void A_STM(ARM* cpu)
if (!(cpu->CurInstr & 0xFFFF)) [[unlikely]] if (!(cpu->CurInstr & 0xFFFF)) [[unlikely]]
{ {
ReglessLDMSTM(cpu, false, baseid, cpu->CurInstr & (1<<21), !(cpu->CurInstr & (1<<23)), preinc, false); ReglessLDMSTM(cpu, false, baseid, cpu->CurInstr & (1<<21), !(cpu->CurInstr & (1<<23)), preinc, false, false);
return; return;
} }
@ -804,7 +804,7 @@ void T_PUSH(ARM* cpu)
if (!nregs) [[unlikely]] if (!nregs) [[unlikely]]
{ {
ReglessLDMSTM(cpu, false, 13, true, true, true, false); ReglessLDMSTM(cpu, false, 13, true, true, true, false, true);
return; return;
} }
@ -850,7 +850,7 @@ void T_POP(ARM* cpu)
if (!(cpu->CurInstr & 0x1FF)) [[unlikely]] if (!(cpu->CurInstr & 0x1FF)) [[unlikely]]
{ {
ReglessLDMSTM(cpu, true, 13, true, false, false, false); ReglessLDMSTM(cpu, true, 13, true, false, false, false, true);
return; return;
} }
@ -902,7 +902,7 @@ void T_STMIA(ARM* cpu)
if (!(cpu->CurInstr & 0xFF)) [[unlikely]] if (!(cpu->CurInstr & 0xFF)) [[unlikely]]
{ {
ReglessLDMSTM(cpu, false, (cpu->CurInstr >> 8) & 0x7, true, false, false, false); ReglessLDMSTM(cpu, false, (cpu->CurInstr >> 8) & 0x7, true, false, false, false, true);
return; return;
} }
@ -938,7 +938,7 @@ void T_LDMIA(ARM* cpu)
if (!(cpu->CurInstr & 0xFF)) [[unlikely]] if (!(cpu->CurInstr & 0xFF)) [[unlikely]]
{ {
ReglessLDMSTM(cpu, true, (cpu->CurInstr >> 8) & 0x7, true, false, false, false); ReglessLDMSTM(cpu, true, (cpu->CurInstr >> 8) & 0x7, true, false, false, false, true);
return; return;
} }