summaryrefslogtreecommitdiffstats
path: root/src/core/arm/interpreter
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-12-17 15:36:23 +0100
committerLioncash <mathew1800@gmail.com>2014-12-17 15:36:25 +0100
commit5289a496a75bd7abe4d18bfc586cb1cfac84fc48 (patch)
tree5b9d0b65118f1398375e3f6cffb0e9a57b0bcb5f /src/core/arm/interpreter
parentMerge pull request #289 from lioncash/smops (diff)
downloadyuzu-5289a496a75bd7abe4d18bfc586cb1cfac84fc48.tar
yuzu-5289a496a75bd7abe4d18bfc586cb1cfac84fc48.tar.gz
yuzu-5289a496a75bd7abe4d18bfc586cb1cfac84fc48.tar.bz2
yuzu-5289a496a75bd7abe4d18bfc586cb1cfac84fc48.tar.lz
yuzu-5289a496a75bd7abe4d18bfc586cb1cfac84fc48.tar.xz
yuzu-5289a496a75bd7abe4d18bfc586cb1cfac84fc48.tar.zst
yuzu-5289a496a75bd7abe4d18bfc586cb1cfac84fc48.zip
Diffstat (limited to 'src/core/arm/interpreter')
-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 5752d116f..dbfb9d858 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);