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

* fix 'STMxx with base register included in register list' when base register is banked.

Browse Source 
* fix cart DMA for ARM9.
This commit is contained in:
StapleButter
2017-02-05 16:50:20 +01:00
parent 829b044802
commit 5ccf56d21d
7 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ARMInterpreter_LoadStore.cpp
View File

@ -441,8 +441,17 @@ void A_STM(ARM* cpu)
preinc = !preinc;
}
bool isbanked = false;
if (cpu->CurInstr & (1<<22))
{
u32 mode = (cpu->CPSR & 0x1F);
if (mode == 0x11)
isbanked = (baseid >= 8 && baseid < 15);
else if (mode != 0x10 && mode != 0x1F)
isbanked = (baseid >= 13 && baseid < 15);
cpu->UpdateMode(cpu->CPSR, (cpu->CPSR&~0x1F)|0x10);
}
for (u32 i = 0; i < 16; i++)
{
@ -450,7 +459,7 @@ void A_STM(ARM* cpu)
{
if (preinc) base += 4;
if (i == baseid)
if (i == baseid && !isbanked)
{
if ((cpu->Num == 0) || (!(cpu->CurInstr & (i-1))))
cpu->DataWrite32(base, oldbase);