summaryrefslogtreecommitdiff
path: root/src/core/arm/interpreter/armemu.cpp
diff options
context:
space:
mode:
authorGravatar Normmatt2014-12-17 02:28:12 -0500
committerGravatar Lioncash2014-12-17 03:16:40 -0500
commitefebd5589a53f3f21f36d1a3c92a4e567bd89c8e (patch)
tree74de1f4484345d3897f41828353c5c5eadd1b3a4 /src/core/arm/interpreter/armemu.cpp
parentMerge pull request #289 from lioncash/smops (diff)
downloadyuzu-efebd5589a53f3f21f36d1a3c92a4e567bd89c8e.tar.gz
yuzu-efebd5589a53f3f21f36d1a3c92a4e567bd89c8e.tar.xz
yuzu-efebd5589a53f3f21f36d1a3c92a4e567bd89c8e.zip
armemu: Fix SXTAH
Diffstat (limited to 'src/core/arm/interpreter/armemu.cpp')
-rw-r--r--src/core/arm/interpreter/armemu.cpp5
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:
6057 6057
6058 return 1; 6058 return 1;
6059 } 6059 }
6060 case 0x6b: { 6060 case 0x6b:
6061 {
6061 ARMword Rm; 6062 ARMword Rm;
6062 int ror = -1; 6063 int ror = -1;
6063 6064
@@ -6088,7 +6089,7 @@ L_stm_s_takeabort:
6088 if (ror == -1) 6089 if (ror == -1)
6089 break; 6090 break;
6090 6091
6091 Rm = ((state->Reg[BITS(0, 3)] >> ror) & 0xFFFF); 6092 Rm = ((state->Reg[BITS(0, 3)] >> ror) & 0xFFFF) | ((state->Reg[BITS(0, 3)] << (32 - ror)) & 0xFFFF) & 0xFFFF;
6092 if (Rm & 0x8000) 6093 if (Rm & 0x8000)
6093 Rm |= 0xffff0000; 6094 Rm |= 0xffff0000;
6094 6095