summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-12-17 20:54:24 +0100
committerbunnei <bunneidev@gmail.com>2014-12-17 20:54:24 +0100
commite6f440ea7f4d5f8c075a5735747ef8facbb4699a (patch)
tree5ceb3cb8409e6ca985134df9d8a95a6830c006e8
parentMerge pull request #287 from lioncash/qaddsub16 (diff)
parentarmemu: Fix SADD16 (diff)
downloadyuzu-e6f440ea7f4d5f8c075a5735747ef8facbb4699a.tar
yuzu-e6f440ea7f4d5f8c075a5735747ef8facbb4699a.tar.gz
yuzu-e6f440ea7f4d5f8c075a5735747ef8facbb4699a.tar.bz2
yuzu-e6f440ea7f4d5f8c075a5735747ef8facbb4699a.tar.lz
yuzu-e6f440ea7f4d5f8c075a5735747ef8facbb4699a.tar.xz
yuzu-e6f440ea7f4d5f8c075a5735747ef8facbb4699a.tar.zst
yuzu-e6f440ea7f4d5f8c075a5735747ef8facbb4699a.zip
-rw-r--r--src/core/arm/interpreter/armemu.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp
index 45714761a..1a589e39c 100644
--- a/src/core/arm/interpreter/armemu.cpp
+++ b/src/core/arm/interpreter/armemu.cpp
@@ -5811,14 +5811,15 @@ L_stm_s_takeabort:
state->Reg[tar] = ((a1 - a2) & 0xFFFF) | (((b1 - b2) & 0xFFFF) << 0x10);
return 1;
} else if ((instr & 0xFF0) == 0xf10) { //sadd16
- u8 tar = BITS(12, 15);
- u8 src1 = BITS(16, 19);
- u8 src2 = BITS(0, 3);
- s16 a1 = (state->Reg[src1] & 0xFFFF);
- s16 a2 = ((state->Reg[src1] >> 0x10) & 0xFFFF);
- s16 b1 = (state->Reg[src2] & 0xFFFF);
- s16 b2 = ((state->Reg[src2] >> 0x10) & 0xFFFF);
- state->Reg[tar] = ((a1 + a2) & 0xFFFF) | (((b1 + b2) & 0xFFFF) << 0x10);
+ const u8 rd_idx = BITS(12, 15);
+ const u8 rm_idx = BITS(0, 3);
+ const u8 rn_idx = BITS(16, 19);
+ const s16 rm_lo = (state->Reg[rm_idx] & 0xFFFF);
+ const s16 rm_hi = ((state->Reg[rm_idx] >> 16) & 0xFFFF);
+ const s16 rn_lo = (state->Reg[rn_idx] & 0xFFFF);
+ const s16 rn_hi = ((state->Reg[rn_idx] >> 16) & 0xFFFF);
+
+ state->Reg[rd_idx] = ((rn_lo + rm_lo) & 0xFFFF) | (((rn_hi + rm_hi) & 0xFFFF) << 16);
return 1;
} else if ((instr & 0xFF0) == 0xf50) { //ssax
u8 tar = BITS(12, 15);