From 30a2d56ea2664338466b274376b5e1c74472ce5a Mon Sep 17 00:00:00 2001
From: ReinUsesLisp <reinuseslisp@airmail.cc>
Date: Wed, 11 Jul 2018 19:31:43 -0300
Subject: [PATCH] Add LOP shader instruction and fix LOP32I pass_b

---
 .../Gal/Shader/ShaderDecodeAlu.cs             | 69 ++++++++++++++++++-
 .../Gal/Shader/ShaderDecodeHelper.cs          |  5 ++
 .../Gal/Shader/ShaderOpCodeTable.cs           |  3 +
 3 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeAlu.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeAlu.cs
index e6daa5505c..7f6b5e056c 100644
--- a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeAlu.cs
+++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeAlu.cs
@@ -244,13 +244,13 @@ namespace Ryujinx.Graphics.Gal.Shader
                 case 2: Inst = ShaderIrInst.Xor; break;
             }
 
-            ShaderIrNode OperA = GetAluNot(GetOperGpr8(OpCode), InvA);
+            ShaderIrNode OperB = GetAluNot(GetOperImm32_20(OpCode), InvB);
 
             //SubOp == 3 is pass, used by the not instruction
             //which just moves the inverted register value.
             if (SubOp < 3)
             {
-                ShaderIrNode OperB = GetAluNot(GetOperImm32_20(OpCode), InvB);
+                ShaderIrNode OperA = GetAluNot(GetOperGpr8(OpCode), InvA);
 
                 ShaderIrOp Op = new ShaderIrOp(Inst, OperA, OperB);
 
@@ -258,10 +258,25 @@ namespace Ryujinx.Graphics.Gal.Shader
             }
             else
             {
-                Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), OperA), OpCode));
+                Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), OperB), OpCode));
             }
         }
 
+        public static void Lop_C(ShaderIrBlock Block, long OpCode)
+        {
+            EmitLop(Block, OpCode, ShaderOper.CR);
+        }
+
+        public static void Lop_I(ShaderIrBlock Block, long OpCode)
+        {
+            EmitLop(Block, OpCode, ShaderOper.Imm);
+        }
+
+        public static void Lop_R(ShaderIrBlock Block, long OpCode)
+        {
+            EmitLop(Block, OpCode, ShaderOper.RR);
+        }
+
         public static void Mufu(ShaderIrBlock Block, long OpCode)
         {
             int SubOp = (int)(OpCode >> 20) & 0xf;
@@ -875,6 +890,54 @@ namespace Ryujinx.Graphics.Gal.Shader
             Block.AddNode(GetPredNode(new ShaderIrAsg(P0Node, Op), OpCode));
         }
 
+        private static void EmitLop(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
+        {
+            int SubOp = (int)(OpCode >> 41) & 3;
+
+            bool InvA = ((OpCode >> 39) & 1) != 0;
+            bool InvB = ((OpCode >> 40) & 1) != 0;
+
+            ShaderIrInst Inst = 0;
+
+            switch (SubOp)
+            {
+                case 0: Inst = ShaderIrInst.And; break;
+                case 1: Inst = ShaderIrInst.Or;  break;
+                case 2: Inst = ShaderIrInst.Xor; break;
+            }
+
+            ShaderIrNode OperA = GetAluNot(GetOperGpr8(OpCode), InvA);
+            ShaderIrNode OperB;
+
+            switch (Oper)
+            {
+                case ShaderOper.CR:  OperB = GetOperCbuf34  (OpCode); break;
+                case ShaderOper.Imm: OperB = GetOperImm19_20(OpCode); break;
+                case ShaderOper.RR:  OperB = GetOperGpr20   (OpCode); break;
+
+                default: throw new ArgumentException(nameof(Oper));
+            }
+
+            OperB = GetAluNot(OperB, InvB);
+
+            ShaderIrNode Op;
+
+            if (SubOp < 3)
+            {
+                Op = new ShaderIrOp(Inst, OperA, OperB);
+            }
+            else
+            {
+                Op = OperB;
+            }
+
+            ShaderIrNode Compare = new ShaderIrOp(ShaderIrInst.Cne, Op, new ShaderIrOperImm(0));
+
+            Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperPred48(OpCode), Compare), OpCode));
+
+            Block.AddNode(GetPredNode(new ShaderIrAsg(GetOperGpr0(OpCode), Op), OpCode));
+        }
+
         private static void EmitXmad(ShaderIrBlock Block, long OpCode, ShaderOper Oper)
         {
             //TODO: Confirm SignAB/C, it is just a guess.
diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs
index a8ad5ec2ec..1f1b158ef8 100644
--- a/Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs
+++ b/Ryujinx.Graphics/Gal/Shader/ShaderDecodeHelper.cs
@@ -156,6 +156,11 @@ namespace Ryujinx.Graphics.Gal.Shader
             return new ShaderIrOperPred((int)(OpCode >> 39) & 7);
         }
 
+        public static ShaderIrOperPred GetOperPred48(long OpCode)
+        {
+            return new ShaderIrOperPred((int)((OpCode >> 48) & 7));
+        }
+
         public static ShaderIrInst GetCmp(long OpCode)
         {
             switch ((int)(OpCode >> 49) & 7)
diff --git a/Ryujinx.Graphics/Gal/Shader/ShaderOpCodeTable.cs b/Ryujinx.Graphics/Gal/Shader/ShaderOpCodeTable.cs
index 5531476a77..2fca1e232f 100644
--- a/Ryujinx.Graphics/Gal/Shader/ShaderOpCodeTable.cs
+++ b/Ryujinx.Graphics/Gal/Shader/ShaderOpCodeTable.cs
@@ -81,7 +81,10 @@ namespace Ryujinx.Graphics.Gal.Shader
             Set("111000110011xx", ShaderDecode.Kil);
             Set("1110111111011x", ShaderDecode.Ld_A);
             Set("1110111110010x", ShaderDecode.Ld_C);
+            Set("0100110001000x", ShaderDecode.Lop_C);
+            Set("0011100001000x", ShaderDecode.Lop_I);
             Set("000001xxxxxxxx", ShaderDecode.Lop_I32);
+            Set("0101110001000x", ShaderDecode.Lop_R);
             Set("0100110010011x", ShaderDecode.Mov_C);
             Set("0011100x10011x", ShaderDecode.Mov_I);
             Set("000000010000xx", ShaderDecode.Mov_I32);