diff options
Diffstat (limited to '')
| -rwxr-xr-x | .travis-deps.sh | 2 | ||||
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 2 |
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 ) elif [ "$TRAVIS_OS_NAME" = "osx" ]; then - brew tap homebrew/versions + brew update > /dev/null # silence the very verbose output brew install qt5 glfw3 pkgconfig gem install xcpretty fi 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) { const s16 operand2 = (high) ? ((rm_val >> 16) & 0xFFFF) : (rm_val & 0xFFFF); const s64 result = (s64)(s32)rn_val * (s64)(s32)operand2 + ((s64)(s32)ra_val << 16); - RD = (result & (0xFFFFFFFFFFFFFFFFLL >> 15)) >> 16; + RD = BITS(result, 16, 47); if ((result >> 16) != (s32)RD) cpu->Cpsr |= (1 << 27); |