summaryrefslogtreecommitdiffstats
path: root/src/core/arm
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-12-08 21:47:20 +0100
committerLioncash <mathew1800@gmail.com>2014-12-08 21:47:20 +0100
commit905e3b616a70abfc2a68b519bc05a6b0f38151af (patch)
treeaa29f09447e977a45383ae5510db0443110f6cc9 /src/core/arm
parentarmemu: Fix SASX (diff)
downloadyuzu-905e3b616a70abfc2a68b519bc05a6b0f38151af.tar
yuzu-905e3b616a70abfc2a68b519bc05a6b0f38151af.tar.gz
yuzu-905e3b616a70abfc2a68b519bc05a6b0f38151af.tar.bz2
yuzu-905e3b616a70abfc2a68b519bc05a6b0f38151af.tar.lz
yuzu-905e3b616a70abfc2a68b519bc05a6b0f38151af.tar.xz
yuzu-905e3b616a70abfc2a68b519bc05a6b0f38151af.tar.zst
yuzu-905e3b616a70abfc2a68b519bc05a6b0f38151af.zip
Diffstat (limited to 'src/core/arm')
-rw-r--r--src/core/arm/interpreter/armemu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp
index d327252dc..d717bd2c8 100644
--- a/src/core/arm/interpreter/armemu.cpp
+++ b/src/core/arm/interpreter/armemu.cpp
@@ -5748,7 +5748,7 @@ L_stm_s_takeabort:
s16 a2 = ((state->Reg[src1] >> 0x10) & 0xFFFF);
s16 b1 = (state->Reg[src2] & 0xFFFF);
s16 b2 = ((state->Reg[src2] >> 0x10) & 0xFFFF);
- state->Reg[tar] = ((a1 - b2) & 0xFFFF) | (((a2 + b1) & 0xFFFF) << 0x10);
+ state->Reg[tar] = ((a1 + b2) & 0xFFFF) | (((a2 - b1) & 0xFFFF) << 0x10);
return 1;
}
else if ((instr & 0xFF0) == 0xf30)//sasx