From e895a4e2d7ebf29fbafda7d950301cd7d03efdbb Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Sat, 25 Apr 2020 22:53:54 -0300
Subject: [PATCH] shader/arithmetic_integer: Fix edge case and mark IADD.X
 Rd.CC as unimplemented

IADD.X Rd.CC requires some extra logic that is not currently
implemented. Abort when this is hit.
---
 src/video_core/shader/decode/arithmetic_integer.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/video_core/shader/decode/arithmetic_integer.cpp b/src/video_core/shader/decode/arithmetic_integer.cpp
index addd7f5333..ced5c3dc12 100644
--- a/src/video_core/shader/decode/arithmetic_integer.cpp
+++ b/src/video_core/shader/decode/arithmetic_integer.cpp
@@ -35,7 +35,8 @@ u32 ShaderIR::DecodeArithmeticInteger(NodeBlock& bb, u32 pc) {
     case OpCode::Id::IADD_C:
     case OpCode::Id::IADD_R:
     case OpCode::Id::IADD_IMM: {
-        UNIMPLEMENTED_IF_MSG(instr.alu.saturate_d, "IADD saturation not implemented");
+        UNIMPLEMENTED_IF_MSG(instr.alu.saturate_d, "IADD.SAT");
+        UNIMPLEMENTED_IF_MSG(instr.iadd.x && instr.generates_cc, "IADD.X Rd.CC");
 
         op_a = GetOperandAbsNegInteger(op_a, false, instr.alu_integer.negate_a, true);
         op_b = GetOperandAbsNegInteger(op_b, false, instr.alu_integer.negate_b, true);
@@ -49,6 +50,10 @@ u32 ShaderIR::DecodeArithmeticInteger(NodeBlock& bb, u32 pc) {
         }
 
         if (instr.generates_cc) {
+            // Avoid changing result's carry flag
+            SetTemporary(bb, 0, std::move(value));
+            value = GetTemporary(0);
+
             const Node i0 = Immediate(0);
 
             Node zero = Operation(OperationCode::LogicalIEqual, value, i0);