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

slightly fix error in writeback handling

Browse Source
This commit is contained in:
Jaklyy 2024-11-09 22:07:17 -05:00
parent ec241a8224
commit fce0555a09
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ARMInterpreter_LoadStore.cpp
View File

@ -115,6 +115,7 @@ void LoadSingle(ARM* cpu, u8 rd, u8 rn, s32 offset)
if constexpr (size == 32) val = ROR(val, ((addr&0x3)<<3)); if constexpr (size == 32) val = ROR(val, ((addr&0x3)<<3));
if constexpr (writeback >= Writeback::Post) addr += offset;
if constexpr (writeback != Writeback::None) cpu->R[rn] = addr; if constexpr (writeback != Writeback::None) cpu->R[rn] = addr;
if (rd == 15) if (rd == 15)
@ -160,8 +161,9 @@ void StoreSingle(ARM* cpu, u8 rd, u8 rn, s32 offset)
((ARMv5*)cpu)->DataAbort(); ((ARMv5*)cpu)->DataAbort();
return; return;
} }
if constexpr (writeback != Writeback::None) cpu->R[rn] += offset; if constexpr (writeback >= Writeback::Post) addr += offset;
if constexpr (writeback != Writeback::None) cpu->R[rn] = addr;
} }