summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.travis-deps.sh2
-rw-r--r--src/core/arm/dyncom/arm_dyncom_interpreter.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh
index d10973410..5c530dcb9 100755
--- a/.travis-deps.sh
+++ b/.travis-deps.sh
@@ -24,7 +24,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then
24 ) 24 )
25 25
26elif [ "$TRAVIS_OS_NAME" = "osx" ]; then 26elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
27 brew tap homebrew/versions 27 brew update > /dev/null # silence the very verbose output
28 brew install qt5 glfw3 pkgconfig 28 brew install qt5 glfw3 pkgconfig
29 gem install xcpretty 29 gem install xcpretty
30fi 30fi
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index b00eb49a9..34cfb8cb2 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -5695,7 +5695,7 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
5695 const s16 operand2 = (high) ? ((rm_val >> 16) & 0xFFFF) : (rm_val & 0xFFFF); 5695 const s16 operand2 = (high) ? ((rm_val >> 16) & 0xFFFF) : (rm_val & 0xFFFF);
5696 const s64 result = (s64)(s32)rn_val * (s64)(s32)operand2 + ((s64)(s32)ra_val << 16); 5696 const s64 result = (s64)(s32)rn_val * (s64)(s32)operand2 + ((s64)(s32)ra_val << 16);
5697 5697
5698 RD = (result & (0xFFFFFFFFFFFFFFFFLL >> 15)) >> 16; 5698 RD = BITS(result, 16, 47);
5699 5699
5700 if ((result >> 16) != (s32)RD) 5700 if ((result >> 16) != (s32)RD)
5701 cpu->Cpsr |= (1 << 27); 5701 cpu->Cpsr |= (1 << 27);