From fb14820c86f082f970183c2722c5c38bcbb5a2ab Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Tue, 27 Apr 2021 21:05:41 -0400
Subject: [PATCH] shader: Fix IADD3.CC

---
 .../translate/impl/integer_add_three_input.cpp  | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/integer_add_three_input.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/integer_add_three_input.cpp
index 15da903656..259a6e6ac4 100644
--- a/src/shader_recompiler/frontend/maxwell/translate/impl/integer_add_three_input.cpp
+++ b/src/shader_recompiler/frontend/maxwell/translate/impl/integer_add_three_input.cpp
@@ -73,21 +73,13 @@ void IADD3(TranslatorVisitor& v, u64 insn, IR::U32 op_b, IR::U32 op_c) {
         op_c = v.ir.INeg(op_c);
     }
 
-    IR::U32 lhs{v.ir.IAdd(op_a, op_b)};
-    IR::U1 of_1;
-    if (iadd3.cc != 0) {
-        of_1 = v.ir.GetOverflowFromOp(lhs);
-    }
+    IR::U32 lhs_1{v.ir.IAdd(op_a, op_b)};
     if (iadd3.x != 0) {
         const IR::U32 carry{v.ir.Select(v.ir.GetCFlag(), v.ir.Imm32(1), v.ir.Imm32(0))};
-        lhs = v.ir.IAdd(lhs, carry);
+        lhs_1 = v.ir.IAdd(lhs_1, carry);
     }
-    if (iadd3.cc != 0 && iadd3.shift == Shift::Left) {
-        const IR::U32 high_bits{v.ir.ShiftRightLogical(lhs, v.ir.Imm32(16))};
-        of_1 = v.ir.LogicalOr(of_1, v.ir.INotEqual(v.ir.Imm32(0), high_bits));
-    }
-    lhs = IntegerShift(v.ir, lhs, iadd3.shift);
-    const IR::U32 result{v.ir.IAdd(lhs, op_c)};
+    const IR::U32 lhs_2{IntegerShift(v.ir, lhs_1, iadd3.shift)};
+    const IR::U32 result{v.ir.IAdd(lhs_2, op_c)};
 
     v.X(iadd3.dest_reg, result);
     if (iadd3.cc != 0) {
@@ -98,6 +90,7 @@ void IADD3(TranslatorVisitor& v, u64 insn, IR::U32 op_b, IR::U32 op_c) {
         v.SetZFlag(v.ir.GetZeroFromOp(result));
         v.SetSFlag(v.ir.GetSignFromOp(result));
         v.SetCFlag(v.ir.GetCarryFromOp(result));
+        const IR::U1 of_1{v.ir.ILessThan(lhs_1, op_a, false)};
         v.SetOFlag(v.ir.LogicalOr(v.ir.GetOverflowFromOp(result), of_1));
     }
 }