summaryrefslogtreecommitdiff
path: root/src/core/arm/interpreter/armemu.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-12-28 11:57:25 -0500
committerGravatar bunnei2014-12-28 11:57:25 -0500
commit762f16c4ad84d50490c7a1db9d636e6c41c8aa09 (patch)
treebc8c7c383f85f593b1a30cb6e7c857ddc19c91ff /src/core/arm/interpreter/armemu.cpp
parentMerge pull request #350 from lioncash/qops (diff)
parentarmemu: Fix underflows in USAD8/USADA8 (diff)
downloadyuzu-762f16c4ad84d50490c7a1db9d636e6c41c8aa09.tar.gz
yuzu-762f16c4ad84d50490c7a1db9d636e6c41c8aa09.tar.xz
yuzu-762f16c4ad84d50490c7a1db9d636e6c41c8aa09.zip
Merge pull request #354 from lioncash/usaduflow
armemu: Fix underflows in USAD8/USADA8
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 5d26456c7..2873da897 100644
--- a/src/core/arm/interpreter/armemu.cpp
+++ b/src/core/arm/interpreter/armemu.cpp
@@ -6672,10 +6672,10 @@ L_stm_s_takeabort:
6672 const u32 rm_val = state->Reg[rm_idx]; 6672 const u32 rm_val = state->Reg[rm_idx];
6673 const u32 rn_val = state->Reg[rn_idx]; 6673 const u32 rn_val = state->Reg[rn_idx];
6674 6674
6675 const u8 diff1 = (u8)std::labs((rn_val & 0xFF) - (rm_val & 0xFF)); 6675 const u8 diff1 = ARMul_UnsignedAbsoluteDifference(rn_val & 0xFF, rm_val & 0xFF);
6676 const u8 diff2 = (u8)std::labs(((rn_val >> 8) & 0xFF) - ((rm_val >> 8) & 0xFF)); 6676 const u8 diff2 = ARMul_UnsignedAbsoluteDifference((rn_val >> 8) & 0xFF, (rm_val >> 8) & 0xFF);
6677 const u8 diff3 = (u8)std::labs(((rn_val >> 16) & 0xFF) - ((rm_val >> 16) & 0xFF)); 6677 const u8 diff3 = ARMul_UnsignedAbsoluteDifference((rn_val >> 16) & 0xFF, (rm_val >> 16) & 0xFF);
6678 const u8 diff4 = (u8)std::labs(((rn_val >> 24) & 0xFF) - ((rm_val >> 24) & 0xFF)); 6678 const u8 diff4 = ARMul_UnsignedAbsoluteDifference((rn_val >> 24) & 0xFF, (rm_val >> 24) & 0xFF);
6679 6679
6680 u32 finalDif = (diff1 + diff2 + diff3 + diff4); 6680 u32 finalDif = (diff1 + diff2 + diff3 + diff4);
6681 6681