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 3 Packages Projects Releases Wiki Activity

fix LDM bugs
Some checks are pending
macOS / ${{ matrix.arch }} (arm64) (push) Waiting to run
Details
macOS / ${{ matrix.arch }} (x86_64) (push) Waiting to run
Details
macOS / Universal binary (push) Blocked by required conditions
Details
Ubuntu / x86_64 (push) Waiting to run
Details
Ubuntu / aarch64 (push) Waiting to run
Details
Windows / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
Arisotura 2024-10-29 14:18:57 +01:00
parent dfd6338992
commit 7a4255b732
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ARMInterpreter_LoadStore.cpp
View File

@ -430,9 +430,9 @@ void A_LDM(ARM* cpu)
} }
} }
u32 pc = 0;
if (cpu->CurInstr & (1<<15)) if (cpu->CurInstr & (1<<15))
{ {
u32 pc;
if (preinc) base += 4; if (preinc) base += 4;
if (first) cpu->DataRead32 (base, &pc); if (first) cpu->DataRead32 (base, &pc);
else cpu->DataRead32S(base, &pc); else cpu->DataRead32S(base, &pc);
@ -440,13 +440,8 @@ void A_LDM(ARM* cpu)
if (cpu->Num == 1) if (cpu->Num == 1)
pc &= ~0x1; pc &= ~0x1;
cpu->JumpTo(pc, cpu->CurInstr & (1<<22));
} }
if ((cpu->CurInstr & (1<<22)) && !(cpu->CurInstr & (1<<15)))
cpu->UpdateMode((cpu->CPSR&~0x1F)|0x10, cpu->CPSR, true);
if (cpu->CurInstr & (1<<21)) if (cpu->CurInstr & (1<<21))
{ {
// post writeback // post writeback
@ -466,6 +461,12 @@ void A_LDM(ARM* cpu)
cpu->R[baseid] = wbbase; cpu->R[baseid] = wbbase;
} }
if ((cpu->CurInstr & (1<<22)) && !(cpu->CurInstr & (1<<15)))
cpu->UpdateMode((cpu->CPSR&~0x1F)|0x10, cpu->CPSR, true);
if (cpu->CurInstr & (1<<15))
cpu->JumpTo(pc, cpu->CurInstr & (1<<22));
cpu->AddCycles_CDI(); cpu->AddCycles_CDI();
} }