Merge pull request #496 from lioncash/warn

dyncom: Clarify precedence for ternary statements

3 files changed, 3 insertions, 3 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) {
                 cpu->Reg[14] = (cpu->Reg[15] + GET_INST_SIZE(cpu));
                 cpu->TFlag = 0x1;
                 int signed_int = inst_cream->val.signed_immed_24;
-                signed_int = (signed_int) & 0x800000 ? (0x3F000000 | signed_int) : signed_int;
+                signed_int = (signed_int & 0x800000) ? (0x3F000000 | signed_int) : signed_int;
                 signed_int = signed_int << 2;
                 cpu->Reg[15] = cpu->Reg[15] + 8 + signed_int + (BIT(inst, 24) << 1);
             }
diff --git a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
index a9df490ba..272ca99f8 100644
--- a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp
@@ -1400,7 +1400,7 @@ u32 vfp_double_cpdo(ARMul_State* state, u32 inst, u32 fpscr)
         u32 except;
         char type;
 
-        type = fop->flags & OP_SD ? 's' : 'd';
+        type = (fop->flags & OP_SD) ? 's' : 'd';
         if (op == FOP_EXT)
             pr_debug("VFP: itr%d (%c%u) = op[%u] (d%u)\n",
                      vecitr >> FPSCR_LENGTH_BIT,
diff --git a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
index 77b528607..b7872bdc4 100644
--- a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
+++ b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp
@@ -1290,7 +1290,7 @@ u32 vfp_single_cpdo(ARMul_State* state, u32 inst, u32 fpscr)
         u32 except;
         char type;
 
-        type = fop->flags & OP_DD ? 'd' : 's';
+        type = (fop->flags & OP_DD) ? 'd' : 's';
         if (op == FOP_EXT)
             pr_debug("VFP: itr%d (%c%u) = op[%u] (s%u=%08x)\n",
                      vecitr >> FPSCR_LENGTH_BIT, type, dest, sn,