summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-01-12 20:12:05 +0100
committerLioncash <mathew1800@gmail.com>2015-01-12 20:15:24 +0100
commitf7770b83d49f3ac791f095ade399705a4d04fe63 (patch)
tree55448ac982348dae114371d67ad9fb899370b1e1 /src/core
parentMerge pull request #475 from lioncash/cleanup (diff)
downloadyuzu-f7770b83d49f3ac791f095ade399705a4d04fe63.tar
yuzu-f7770b83d49f3ac791f095ade399705a4d04fe63.tar.gz
yuzu-f7770b83d49f3ac791f095ade399705a4d04fe63.tar.bz2
yuzu-f7770b83d49f3ac791f095ade399705a4d04fe63.tar.lz
yuzu-f7770b83d49f3ac791f095ade399705a4d04fe63.tar.xz
yuzu-f7770b83d49f3ac791f095ade399705a4d04fe63.tar.zst
yuzu-f7770b83d49f3ac791f095ade399705a4d04fe63.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/arm/dyncom/arm_dyncom_interpreter.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index c6a9baae3..b5e0993ed 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -176,13 +176,11 @@ unsigned int DPO(ArithmeticShiftRightByImmediate)(arm_processor *cpu, unsigned i
unsigned int shifter_operand;
int shift_imm = BITS(sht_oper, 7, 11);
if (shift_imm == 0) {
- if (BIT(rm, 31)) {
+ if (BIT(rm, 31) == 0)
shifter_operand = 0;
- cpu->shifter_carry_out = BIT(rm, 31);
- } else {
+ else
shifter_operand = 0xFFFFFFFF;
- cpu->shifter_carry_out = BIT(rm, 31);
- }
+ cpu->shifter_carry_out = BIT(rm, 31);
} else {
shifter_operand = static_cast<int>(rm) >> shift_imm;
cpu->shifter_carry_out = BIT(rm, shift_imm - 1);