diff options
| author | RSDuck <rsduck@users.noreply.github.com> | 2020-02-04 17:28:51 +0100 |
|---|---|---|
| committer | RSDuck <rsduck@users.noreply.github.com> | 2020-06-16 11:57:49 +0200 |
| commit | ec965c6014df2eb252d9da498684e94fe41fece4 (patch) | |
| tree | 5a25b2ada4f26d5072cde186c93861308717379a /src/ARMJIT_x64/ARMJIT_LoadStore.cpp | |
| parent | 000c03c9d6307faa7b52988da1510cc4d0dcd8a3 (diff) | |
improve nop handling and proper behaviour for LDM^
fixes dslinux
Diffstat (limited to 'src/ARMJIT_x64/ARMJIT_LoadStore.cpp')
| -rw-r--r-- | src/ARMJIT_x64/ARMJIT_LoadStore.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ARMJIT_x64/ARMJIT_LoadStore.cpp b/src/ARMJIT_x64/ARMJIT_LoadStore.cpp index b66f304..4cafc1c 100644 --- a/src/ARMJIT_x64/ARMJIT_LoadStore.cpp +++ b/src/ARMJIT_x64/ARMJIT_LoadStore.cpp @@ -531,7 +531,7 @@ s32 Compiler::Comp_MemAccessBlock(int rn, BitSet16 regs, bool store, bool preinc { if (regs[reg]) { - if (usermode && reg >= 8 && reg < 15) + if (usermode && !regs[15] && reg >= 8 && reg < 15) { if (firstUserMode) { @@ -545,7 +545,8 @@ s32 Compiler::Comp_MemAccessBlock(int rn, BitSet16 regs, bool store, bool preinc FixupBranch sucessfulWritten = J_CC(CC_NC); if (RegCache.Mapping[reg] != INVALID_REG) MOV(32, R(RegCache.Mapping[reg]), R(ABI_PARAM3)); - SaveReg(reg, ABI_PARAM3); + else + SaveReg(reg, ABI_PARAM3); SetJumpTarget(sucessfulWritten); } else if (RegCache.Mapping[reg] == INVALID_REG) |