summaryrefslogtreecommitdiff
path: root/src/core/arm/dyncom
diff options
context:
space:
mode:
authorGravatar bunnei2015-01-20 10:32:00 -0500
committerGravatar bunnei2015-01-20 10:32:00 -0500
commit2a5654ea8a07965c4320f602c9423033c60971f9 (patch)
treee3a5e8e7ce1dd0d56b1a828ad672f17aa586b138 /src/core/arm/dyncom
parentMerge pull request #494 from lioncash/shift (diff)
parentdyncom: Clarify precedence for ternary statements (diff)
downloadyuzu-2a5654ea8a07965c4320f602c9423033c60971f9.tar.gz
yuzu-2a5654ea8a07965c4320f602c9423033c60971f9.tar.xz
yuzu-2a5654ea8a07965c4320f602c9423033c60971f9.zip
Merge pull request #496 from lioncash/warn
dyncom: Clarify precedence for ternary statements
Diffstat (limited to 'src/core/arm/dyncom')
-rw-r--r--src/core/arm/dyncom/arm_dyncom_interpreter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index ffe9d17f9..fce8d8e4f 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -4177,7 +4177,7 @@ unsigned InterpreterMainLoop(ARMul_State* state) {
4177 cpu->Reg[14] = (cpu->Reg[15] + GET_INST_SIZE(cpu)); 4177 cpu->Reg[14] = (cpu->Reg[15] + GET_INST_SIZE(cpu));
4178 cpu->TFlag = 0x1; 4178 cpu->TFlag = 0x1;
4179 int signed_int = inst_cream->val.signed_immed_24; 4179 int signed_int = inst_cream->val.signed_immed_24;
4180 signed_int = (signed_int) & 0x800000 ? (0x3F000000 | signed_int) : signed_int; 4180 signed_int = (signed_int & 0x800000) ? (0x3F000000 | signed_int) : signed_int;
4181 signed_int = signed_int << 2; 4181 signed_int = signed_int << 2;
4182 cpu->Reg[15] = cpu->Reg[15] + 8 + signed_int + (BIT(inst, 24) << 1); 4182 cpu->Reg[15] = cpu->Reg[15] + 8 + signed_int + (BIT(inst, 24) << 1);
4183 } 4183 }