diff options
| author |  Lioncash | 2015-08-26 00:10:23 -0400 |
|---|---|---|
| committer | Lioncash | 2015-08-26 00:10:23 -0400 |
| commit | dc1b024b801d8e5499fabd2a491b6e0a14d6b9c3 (patch) | |
| tree | f5243e934cb93faf15ee674e660acb5993531ef4 /src/core | |
| parent | dyncom: Change return type of CondPassed to bool (diff) | |
| download | yuzu-dc1b024b801d8e5499fabd2a491b6e0a14d6b9c3.tar.gz yuzu-dc1b024b801d8e5499fabd2a491b6e0a14d6b9c3.tar.xz yuzu-dc1b024b801d8e5499fabd2a491b6e0a14d6b9c3.zip | |
dyncom: Simplify some comparisons in CondPassed
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_interpreter.cpp | 8 |
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) { | |||
| 77 | case ConditionCode::LS: | 77 | case ConditionCode::LS: |
| 78 | return (!c_flag || z_flag); | 78 | return (!c_flag || z_flag); |
| 79 | case ConditionCode::GE: | 79 | case ConditionCode::GE: |
| 80 | return ((!n_flag && !v_flag) || (n_flag && v_flag)); | 80 | return (n_flag == v_flag); |
| 81 | case ConditionCode::LT: | 81 | case ConditionCode::LT: |
| 82 | return ((n_flag && !v_flag) || (!n_flag && v_flag)); | 82 | return (n_flag != v_flag); |
| 83 | case ConditionCode::GT: | 83 | case ConditionCode::GT: |
| 84 | return ((!n_flag && !v_flag && !z_flag) || (n_flag && v_flag && !z_flag)); | 84 | return (!z_flag && (n_flag == v_flag)); |
| 85 | case ConditionCode::LE: | 85 | case ConditionCode::LE: |
| 86 | return ((n_flag && !v_flag) || (!n_flag && v_flag)) || z_flag; | 86 | return (z_flag || (n_flag != v_flag)); |
| 87 | case ConditionCode::AL: | 87 | case ConditionCode::AL: |
| 88 | case ConditionCode::NV: // Unconditional | 88 | case ConditionCode::NV: // Unconditional |
| 89 | return true; | 89 | return true; |