diff options
| author | Normmatt <normmatt234@gmail.com> | 2014-12-17 08:28:12 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-12-17 09:16:40 +0100 |
| commit | efebd5589a53f3f21f36d1a3c92a4e567bd89c8e (patch) | |
| tree | 74de1f4484345d3897f41828353c5c5eadd1b3a4 /src/core/arm | |
| parent | Merge pull request #289 from lioncash/smops (diff) | |
| download | yuzu-efebd5589a53f3f21f36d1a3c92a4e567bd89c8e.tar yuzu-efebd5589a53f3f21f36d1a3c92a4e567bd89c8e.tar.gz yuzu-efebd5589a53f3f21f36d1a3c92a4e567bd89c8e.tar.bz2 yuzu-efebd5589a53f3f21f36d1a3c92a4e567bd89c8e.tar.lz yuzu-efebd5589a53f3f21f36d1a3c92a4e567bd89c8e.tar.xz yuzu-efebd5589a53f3f21f36d1a3c92a4e567bd89c8e.tar.zst yuzu-efebd5589a53f3f21f36d1a3c92a4e567bd89c8e.zip | |
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/interpreter/armemu.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index 5752d116f..843323293 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp @@ -6057,7 +6057,8 @@ L_stm_s_takeabort: return 1; } - case 0x6b: { + case 0x6b: + { ARMword Rm; int ror = -1; @@ -6088,7 +6089,7 @@ L_stm_s_takeabort: if (ror == -1) break; - Rm = ((state->Reg[BITS(0, 3)] >> ror) & 0xFFFF); + Rm = ((state->Reg[BITS(0, 3)] >> ror) & 0xFFFF) | ((state->Reg[BITS(0, 3)] << (32 - ror)) & 0xFFFF) & 0xFFFF; if (Rm & 0x8000) Rm |= 0xffff0000; |