summaryrefslogtreecommitdiffstats
path: root/src/core/arm
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-12-08 07:44:37 +0100
committerLioncash <mathew1800@gmail.com>2014-12-08 07:44:37 +0100
commit62fd564854b31f7e3203db3fb6f113231c30a3b7 (patch)
treeb41e1679b48290f3a3f61cc9edf90750866221c4 /src/core/arm
parentarmemu: Fix parenthesis warnings regarding bitwise ops (diff)
downloadyuzu-62fd564854b31f7e3203db3fb6f113231c30a3b7.tar
yuzu-62fd564854b31f7e3203db3fb6f113231c30a3b7.tar.gz
yuzu-62fd564854b31f7e3203db3fb6f113231c30a3b7.tar.bz2
yuzu-62fd564854b31f7e3203db3fb6f113231c30a3b7.tar.lz
yuzu-62fd564854b31f7e3203db3fb6f113231c30a3b7.tar.xz
yuzu-62fd564854b31f7e3203db3fb6f113231c30a3b7.tar.zst
yuzu-62fd564854b31f7e3203db3fb6f113231c30a3b7.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 cb7c27030..d327252dc 100644
--- a/src/core/arm/interpreter/armemu.cpp
+++ b/src/core/arm/interpreter/armemu.cpp
@@ -5760,7 +5760,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] = ((a2 - b1) & 0xFFFF) | (((a2 + b1) & 0xFFFF) << 0x10);
+ state->Reg[tar] = ((a1 - b2) & 0xFFFF) | (((a2 + b1) & 0xFFFF) << 0x10);
return 1;
}
else printf ("Unhandled v6 insn: sadd/ssub\n");