summaryrefslogtreecommitdiff
path: root/src/core/arm/interpreter/armemu.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2014-12-28 06:07:24 -0500
committerGravatar Lioncash2014-12-28 06:09:43 -0500
commit059c65a27af538cba40aa43d2eeb3a544661a9b8 (patch)
tree250facd7671854ca8818c7900515813a3b7d94de /src/core/arm/interpreter/armemu.cpp
parentMerge pull request #349 from lioncash/uhdync (diff)
downloadyuzu-059c65a27af538cba40aa43d2eeb3a544661a9b8.tar.gz
yuzu-059c65a27af538cba40aa43d2eeb3a544661a9b8.tar.xz
yuzu-059c65a27af538cba40aa43d2eeb3a544661a9b8.zip
armemu: Fix underflows in USAD8/USADA8
Initially reported by xdec.
Diffstat (limited to 'src/core/arm/interpreter/armemu.cpp')
-rw-r--r--src/core/arm/interpreter/armemu.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp
index 9b680c1e2..404012b2a 100644
--- a/src/core/arm/interpreter/armemu.cpp
+++ b/src/core/arm/interpreter/armemu.cpp
@@ -6643,10 +6643,10 @@ L_stm_s_takeabort:
6643 const u32 rm_val = state->Reg[rm_idx]; 6643 const u32 rm_val = state->Reg[rm_idx];
6644 const u32 rn_val = state->Reg[rn_idx]; 6644 const u32 rn_val = state->Reg[rn_idx];
6645 6645
6646 const u8 diff1 = (u8)std::labs((rn_val & 0xFF) - (rm_val & 0xFF)); 6646 const u8 diff1 = ARMul_UnsignedAbsoluteDifference(rn_val & 0xFF, rm_val & 0xFF);
6647 const u8 diff2 = (u8)std::labs(((rn_val >> 8) & 0xFF) - ((rm_val >> 8) & 0xFF)); 6647 const u8 diff2 = ARMul_UnsignedAbsoluteDifference((rn_val >> 8) & 0xFF, (rm_val >> 8) & 0xFF);
6648 const u8 diff3 = (u8)std::labs(((rn_val >> 16) & 0xFF) - ((rm_val >> 16) & 0xFF)); 6648 const u8 diff3 = ARMul_UnsignedAbsoluteDifference((rn_val >> 16) & 0xFF, (rm_val >> 16) & 0xFF);
6649 const u8 diff4 = (u8)std::labs(((rn_val >> 24) & 0xFF) - ((rm_val >> 24) & 0xFF)); 6649 const u8 diff4 = ARMul_UnsignedAbsoluteDifference((rn_val >> 24) & 0xFF, (rm_val >> 24) & 0xFF);
6650 6650
6651 u32 finalDif = (diff1 + diff2 + diff3 + diff4); 6651 u32 finalDif = (diff1 + diff2 + diff3 + diff4);
6652 6652