summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-08-26 06:10:23 +0200
committerLioncash <mathew1800@gmail.com>2015-08-26 06:10:23 +0200
commitdc1b024b801d8e5499fabd2a491b6e0a14d6b9c3 (patch)
treef5243e934cb93faf15ee674e660acb5993531ef4 /src/core
parentdyncom: Change return type of CondPassed to bool (diff)
downloadyuzu-dc1b024b801d8e5499fabd2a491b6e0a14d6b9c3.tar
yuzu-dc1b024b801d8e5499fabd2a491b6e0a14d6b9c3.tar.gz
yuzu-dc1b024b801d8e5499fabd2a491b6e0a14d6b9c3.tar.bz2
yuzu-dc1b024b801d8e5499fabd2a491b6e0a14d6b9c3.tar.lz
yuzu-dc1b024b801d8e5499fabd2a491b6e0a14d6b9c3.tar.xz
yuzu-dc1b024b801d8e5499fabd2a491b6e0a14d6b9c3.tar.zst
yuzu-dc1b024b801d8e5499fabd2a491b6e0a14d6b9c3.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/arm/dyncom/arm_dyncom_interpreter.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index 0756cfe61..0fddb07a0 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -77,13 +77,13 @@ static bool CondPassed(ARMul_State* cpu, unsigned int cond) {
case ConditionCode::LS:
return (!c_flag || z_flag);
case ConditionCode::GE:
- return ((!n_flag && !v_flag) || (n_flag && v_flag));
+ return (n_flag == v_flag);
case ConditionCode::LT:
- return ((n_flag && !v_flag) || (!n_flag && v_flag));
+ return (n_flag != v_flag);
case ConditionCode::GT:
- return ((!n_flag && !v_flag && !z_flag) || (n_flag && v_flag && !z_flag));
+ return (!z_flag && (n_flag == v_flag));
case ConditionCode::LE:
- return ((n_flag && !v_flag) || (!n_flag && v_flag)) || z_flag;
+ return (z_flag || (n_flag != v_flag));
case ConditionCode::AL:
case ConditionCode::NV: // Unconditional
return true;