diff options
| author | 2014-12-20 15:40:03 -0500 | |
|---|---|---|
| committer | 2014-12-20 15:40:03 -0500 | |
| commit | 58af74d58da07453a30e24f92b9542f750c46c7b (patch) | |
| tree | 0d914e29724943b8cee1017fa800ad873161cf35 /src/core/arm/interpreter/armemu.cpp | |
| parent | Merge pull request #311 from lioncash/usada (diff) | |
| parent | armemu: Should be using labs for USAD8/USADA8 (diff) | |
| download | yuzu-58af74d58da07453a30e24f92b9542f750c46c7b.tar.gz yuzu-58af74d58da07453a30e24f92b9542f750c46c7b.tar.xz yuzu-58af74d58da07453a30e24f92b9542f750c46c7b.zip | |
Merge pull request #320 from lioncash/labs
armemu: Should be using labs for USAD8/USADA8
Diffstat (limited to 'src/core/arm/interpreter/armemu.cpp')
| -rw-r--r-- | src/core/arm/interpreter/armemu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/arm/interpreter/armemu.cpp b/src/core/arm/interpreter/armemu.cpp index 7408b6f08..06439b73c 100644 --- a/src/core/arm/interpreter/armemu.cpp +++ b/src/core/arm/interpreter/armemu.cpp | |||
| @@ -6383,10 +6383,10 @@ L_stm_s_takeabort: | |||
| 6383 | const u32 rm_val = state->Reg[rm_idx]; | 6383 | const u32 rm_val = state->Reg[rm_idx]; |
| 6384 | const u32 rn_val = state->Reg[rn_idx]; | 6384 | const u32 rn_val = state->Reg[rn_idx]; |
| 6385 | 6385 | ||
| 6386 | const u8 diff1 = (u8)::abs((rn_val & 0xFF) - (rm_val & 0xFF)); | 6386 | const u8 diff1 = (u8)std::labs((rn_val & 0xFF) - (rm_val & 0xFF)); |
| 6387 | const u8 diff2 = (u8)::abs(((rn_val >> 8) & 0xFF) - ((rm_val >> 8) & 0xFF)); | 6387 | const u8 diff2 = (u8)std::labs(((rn_val >> 8) & 0xFF) - ((rm_val >> 8) & 0xFF)); |
| 6388 | const u8 diff3 = (u8)::abs(((rn_val >> 16) & 0xFF) - ((rm_val >> 16) & 0xFF)); | 6388 | const u8 diff3 = (u8)std::labs(((rn_val >> 16) & 0xFF) - ((rm_val >> 16) & 0xFF)); |
| 6389 | const u8 diff4 = (u8)::abs(((rn_val >> 24) & 0xFF) - ((rm_val >> 24) & 0xFF)); | 6389 | const u8 diff4 = (u8)std::labs(((rn_val >> 24) & 0xFF) - ((rm_val >> 24) & 0xFF)); |
| 6390 | 6390 | ||
| 6391 | u32 finalDif = (diff1 + diff2 + diff3 + diff4); | 6391 | u32 finalDif = (diff1 + diff2 + diff3 + diff4); |
| 6392 | 6392 | ||