Implement BFI, BRK, FLO, FSWZADD, PBK, SHFL and TXD shader instructions, misc. fixes

10 files changed, 228 insertions, 139 deletions

diff --git a/Ryujinx.Graphics.Shader/Decoders/Decoder.cs b/Ryujinx.Graphics.Shader/Decoders/Decoder.cs
index dd5347d9..4078440b 100644
--- a/Ryujinx.Graphics.Shader/Decoders/Decoder.cs
+++ b/Ryujinx.Graphics.Shader/Decoders/Decoder.cs
@@ -241,7 +241,7 @@ namespace Ryujinx.Graphics.Shader.Decoders
 
         private static bool IsBranch(OpCode opCode)
         {
-            return (opCode is OpCodeBranch && opCode.Emitter != InstEmit.Ssy) ||
+            return (opCode is OpCodeBranch opBranch && !opBranch.PushTarget) ||
                     opCode is OpCodeSync ||
                     opCode is OpCodeExit;
         }
diff --git a/Ryujinx.Graphics.Shader/Decoders/OpCodeBranch.cs b/Ryujinx.Graphics.Shader/Decoders/OpCodeBranch.cs
index 25941b39..f51c3996 100644
--- a/Ryujinx.Graphics.Shader/Decoders/OpCodeBranch.cs
+++ b/Ryujinx.Graphics.Shader/Decoders/OpCodeBranch.cs
@@ -6,9 +6,13 @@ namespace Ryujinx.Graphics.Shader.Decoders
     {
         public int Offset { get; }
 
+        public bool PushTarget { get; protected set; }
+
         public OpCodeBranch(InstEmitter emitter, ulong address, long opCode) : base(emitter, address, opCode)
         {
             Offset = ((int)(opCode >> 20) << 8) >> 8;
+
+            PushTarget = false;
         }
 
         public ulong GetAbsoluteAddress()
diff --git a/Ryujinx.Graphics.Shader/Decoders/OpCodeShuffle.cs b/Ryujinx.Graphics.Shader/Decoders/OpCodeShuffle.cs
new file mode 100644
index 00000000..43693cf4
--- /dev/null
+++ b/Ryujinx.Graphics.Shader/Decoders/OpCodeShuffle.cs
@@ -0,0 +1,40 @@
+using Ryujinx.Graphics.Shader.Instructions;
+
+namespace Ryujinx.Graphics.Shader.Decoders
+{
+    class OpCodeShuffle : OpCode, IOpCodeRd, IOpCodeRa
+    {
+        public Register Rd { get; }
+        public Register Ra { get; }
+        public Register Rb { get; }
+        public Register Rc { get; }
+
+        public int ImmediateB { get; }
+        public int ImmediateC { get; }
+
+        public bool IsBImmediate { get; }
+        public bool IsCImmediate { get; }
+
+        public ShuffleType ShuffleType { get; }
+
+        public Register Predicate48 { get; }
+
+        public OpCodeShuffle(InstEmitter emitter, ulong address, long opCode) : base(emitter, address, opCode)
+        {
+            Rd = new Register(opCode.Extract(0,  8), RegisterType.Gpr);
+            Ra = new Register(opCode.Extract(8,  8), RegisterType.Gpr);
+            Rb = new Register(opCode.Extract(20, 8), RegisterType.Gpr);
+            Rc = new Register(opCode.Extract(39, 8), RegisterType.Gpr);
+
+            ImmediateB = opCode.Extract(20, 5);
+            ImmediateC = opCode.Extract(34, 13);
+
+            IsBImmediate = opCode.Extract(28);
+            IsCImmediate = opCode.Extract(29);
+
+            ShuffleType = (ShuffleType)opCode.Extract(30, 2);
+
+            Predicate48 = new Register(opCode.Extract(48, 3), RegisterType.Predicate);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/Decoders/OpCodeSsy.cs b/Ryujinx.Graphics.Shader/Decoders/OpCodeSsy.cs
index 499c0706..d3831e22 100644
--- a/Ryujinx.Graphics.Shader/Decoders/OpCodeSsy.cs
+++ b/Ryujinx.Graphics.Shader/Decoders/OpCodeSsy.cs
@@ -15,6 +15,8 @@ namespace Ryujinx.Graphics.Shader.Decoders
             Predicate = new Register(RegisterConsts.PredicateTrueIndex, RegisterType.Predicate);
 
             InvertPredicate = false;
+
+            PushTarget = true;
         }
     }
 }
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/Decoders/OpCodeTable.cs b/Ryujinx.Graphics.Shader/Decoders/OpCodeTable.cs
index 5128dae3..7adaff61 100644
--- a/Ryujinx.Graphics.Shader/Decoders/OpCodeTable.cs
+++ b/Ryujinx.Graphics.Shader/Decoders/OpCodeTable.cs
@@ -30,136 +30,148 @@ namespace Ryujinx.Graphics.Shader.Decoders
             _opCodes = new TableEntry[1 << EncodingBits];
 
 #region Instructions
-            Set("1110111111011x", InstEmit.Ald,    typeof(OpCodeAttribute));
-            Set("1110111111110x", InstEmit.Ast,    typeof(OpCodeAttribute));
-            Set("0100110000000x", InstEmit.Bfe,    typeof(OpCodeAluCbuf));
-            Set("0011100x00000x", InstEmit.Bfe,    typeof(OpCodeAluImm));
-            Set("0101110000000x", InstEmit.Bfe,    typeof(OpCodeAluReg));
-            Set("111000100100xx", InstEmit.Bra,    typeof(OpCodeBranch));
-            Set("0101000010100x", InstEmit.Csetp,  typeof(OpCodePsetp));
-            Set("111000110000xx", InstEmit.Exit,   typeof(OpCodeExit));
-            Set("0100110010101x", InstEmit.F2F,    typeof(OpCodeFArithCbuf));
-            Set("0011100x10101x", InstEmit.F2F,    typeof(OpCodeFArithImm));
-            Set("0101110010101x", InstEmit.F2F,    typeof(OpCodeFArithReg));
-            Set("0100110010110x", InstEmit.F2I,    typeof(OpCodeFArithCbuf));
-            Set("0011100x10110x", InstEmit.F2I,    typeof(OpCodeFArithImm));
-            Set("0101110010110x", InstEmit.F2I,    typeof(OpCodeFArithReg));
-            Set("0100110001011x", InstEmit.Fadd,   typeof(OpCodeFArithCbuf));
-            Set("0011100x01011x", InstEmit.Fadd,   typeof(OpCodeFArithImm));
-            Set("000010xxxxxxxx", InstEmit.Fadd,   typeof(OpCodeFArithImm32));
-            Set("0101110001011x", InstEmit.Fadd,   typeof(OpCodeFArithReg));
-            Set("010010011xxxxx", InstEmit.Ffma,   typeof(OpCodeFArithCbuf));
-            Set("0011001x1xxxxx", InstEmit.Ffma,   typeof(OpCodeFArithImm));
-            Set("010100011xxxxx", InstEmit.Ffma,   typeof(OpCodeFArithRegCbuf));
-            Set("010110011xxxxx", InstEmit.Ffma,   typeof(OpCodeFArithReg));
-            Set("0100110001100x", InstEmit.Fmnmx,  typeof(OpCodeFArithCbuf));
-            Set("0011100x01100x", InstEmit.Fmnmx,  typeof(OpCodeFArithImm));
-            Set("0101110001100x", InstEmit.Fmnmx,  typeof(OpCodeFArithReg));
-            Set("0100110001101x", InstEmit.Fmul,   typeof(OpCodeFArithCbuf));
-            Set("0011100x01101x", InstEmit.Fmul,   typeof(OpCodeFArithImm));
-            Set("00011110xxxxxx", InstEmit.Fmul,   typeof(OpCodeFArithImm32));
-            Set("0101110001101x", InstEmit.Fmul,   typeof(OpCodeFArithReg));
-            Set("0100100xxxxxxx", InstEmit.Fset,   typeof(OpCodeSetCbuf));
-            Set("0011000xxxxxxx", InstEmit.Fset,   typeof(OpCodeFsetImm));
-            Set("01011000xxxxxx", InstEmit.Fset,   typeof(OpCodeSetReg));
-            Set("010010111011xx", InstEmit.Fsetp,  typeof(OpCodeSetCbuf));
-            Set("0011011x1011xx", InstEmit.Fsetp,  typeof(OpCodeFsetImm));
-            Set("010110111011xx", InstEmit.Fsetp,  typeof(OpCodeSetReg));
-            Set("0111101x1xxxxx", InstEmit.Hadd2,  typeof(OpCodeAluCbuf));
-            Set("0111101x0xxxxx", InstEmit.Hadd2,  typeof(OpCodeAluImm2x10));
-            Set("0010110xxxxxxx", InstEmit.Hadd2,  typeof(OpCodeAluImm32));
-            Set("0101110100010x", InstEmit.Hadd2,  typeof(OpCodeAluReg));
-            Set("01110xxx1xxxxx", InstEmit.Hfma2,  typeof(OpCodeHfmaCbuf));
-            Set("01110xxx0xxxxx", InstEmit.Hfma2,  typeof(OpCodeHfmaImm2x10));
-            Set("0010100xxxxxxx", InstEmit.Hfma2,  typeof(OpCodeHfmaImm32));
-            Set("0101110100000x", InstEmit.Hfma2,  typeof(OpCodeHfmaReg));
-            Set("01100xxx1xxxxx", InstEmit.Hfma2,  typeof(OpCodeHfmaRegCbuf));
-            Set("0111100x1xxxxx", InstEmit.Hmul2,  typeof(OpCodeAluCbuf));
-            Set("0111100x0xxxxx", InstEmit.Hmul2,  typeof(OpCodeAluImm2x10));
-            Set("0010101xxxxxxx", InstEmit.Hmul2,  typeof(OpCodeAluImm32));
-            Set("0101110100001x", InstEmit.Hmul2,  typeof(OpCodeAluReg));
-            Set("0111111x1xxxxx", InstEmit.Hsetp2, typeof(OpCodeSetCbuf));
-            Set("0111111x0xxxxx", InstEmit.Hsetp2, typeof(OpCodeHsetImm2x10));
-            Set("0101110100100x", InstEmit.Hsetp2, typeof(OpCodeSetReg));
-            Set("0100110010111x", InstEmit.I2F,    typeof(OpCodeAluCbuf));
-            Set("0011100x10111x", InstEmit.I2F,    typeof(OpCodeAluImm));
-            Set("0101110010111x", InstEmit.I2F,    typeof(OpCodeAluReg));
-            Set("0100110011100x", InstEmit.I2I,    typeof(OpCodeAluCbuf));
-            Set("0011100x11100x", InstEmit.I2I,    typeof(OpCodeAluImm));
-            Set("0101110011100x", InstEmit.I2I,    typeof(OpCodeAluReg));
-            Set("0100110000010x", InstEmit.Iadd,   typeof(OpCodeAluCbuf));
-            Set("0011100000010x", InstEmit.Iadd,   typeof(OpCodeAluImm));
-            Set("0001110x0xxxxx", InstEmit.Iadd,   typeof(OpCodeAluImm32));
-            Set("0101110000010x", InstEmit.Iadd,   typeof(OpCodeAluReg));
-            Set("010011001100xx", InstEmit.Iadd3,  typeof(OpCodeAluCbuf));
-            Set("001110001100xx", InstEmit.Iadd3,  typeof(OpCodeAluImm));
-            Set("010111001100xx", InstEmit.Iadd3,  typeof(OpCodeAluReg));
-            Set("0100110000100x", InstEmit.Imnmx,  typeof(OpCodeAluCbuf));
-            Set("0011100x00100x", InstEmit.Imnmx,  typeof(OpCodeAluImm));
-            Set("0101110000100x", InstEmit.Imnmx,  typeof(OpCodeAluReg));
-            Set("11100000xxxxxx", InstEmit.Ipa,    typeof(OpCodeIpa));
-            Set("1110111111010x", InstEmit.Isberd, typeof(OpCodeAlu));
-            Set("0100110000011x", InstEmit.Iscadd, typeof(OpCodeAluCbuf));
-            Set("0011100x00011x", InstEmit.Iscadd, typeof(OpCodeAluImm));
-            Set("000101xxxxxxxx", InstEmit.Iscadd, typeof(OpCodeAluImm32));
-            Set("0101110000011x", InstEmit.Iscadd, typeof(OpCodeAluReg));
-            Set("010010110101xx", InstEmit.Iset,   typeof(OpCodeSetCbuf));
-            Set("001101100101xx", InstEmit.Iset,   typeof(OpCodeSetImm));
-            Set("010110110101xx", InstEmit.Iset,   typeof(OpCodeSetReg));
-            Set("010010110110xx", InstEmit.Isetp,  typeof(OpCodeSetCbuf));
-            Set("0011011x0110xx", InstEmit.Isetp,  typeof(OpCodeSetImm));
-            Set("010110110110xx", InstEmit.Isetp,  typeof(OpCodeSetReg));
-            Set("111000110011xx", InstEmit.Kil,    typeof(OpCodeExit));
-            Set("1110111101000x", InstEmit.Ld,     typeof(OpCodeMemory));
-            Set("1110111110010x", InstEmit.Ldc,    typeof(OpCodeLdc));
-            Set("1110111011010x", InstEmit.Ldg,    typeof(OpCodeMemory));
-            Set("0100110001000x", InstEmit.Lop,    typeof(OpCodeLopCbuf));
-            Set("0011100001000x", InstEmit.Lop,    typeof(OpCodeLopImm));
-            Set("000001xxxxxxxx", InstEmit.Lop,    typeof(OpCodeLopImm32));
-            Set("0101110001000x", InstEmit.Lop,    typeof(OpCodeLopReg));
-            Set("0010000xxxxxxx", InstEmit.Lop3,   typeof(OpCodeLopCbuf));
-            Set("001111xxxxxxxx", InstEmit.Lop3,   typeof(OpCodeLopImm));
-            Set("0101101111100x", InstEmit.Lop3,   typeof(OpCodeLopReg));
-            Set("0100110010011x", InstEmit.Mov,    typeof(OpCodeAluCbuf));
-            Set("0011100x10011x", InstEmit.Mov,    typeof(OpCodeAluImm));
-            Set("000000010000xx", InstEmit.Mov,    typeof(OpCodeAluImm32));
-            Set("0101110010011x", InstEmit.Mov,    typeof(OpCodeAluReg));
-            Set("0101000010000x", InstEmit.Mufu,   typeof(OpCodeFArith));
-            Set("1111101111100x", InstEmit.Out,    typeof(OpCode));
-            Set("0101000010010x", InstEmit.Psetp,  typeof(OpCodePsetp));
-            Set("0100110010010x", InstEmit.Rro,    typeof(OpCodeFArithCbuf));
-            Set("0011100x10010x", InstEmit.Rro,    typeof(OpCodeFArithImm));
-            Set("0101110010010x", InstEmit.Rro,    typeof(OpCodeFArithReg));
-            Set("1111000011001x", InstEmit.S2r,    typeof(OpCodeAlu));
-            Set("0100110010100x", InstEmit.Sel,    typeof(OpCodeAluCbuf));
-            Set("0011100x10100x", InstEmit.Sel,    typeof(OpCodeAluImm));
-            Set("0101110010100x", InstEmit.Sel,    typeof(OpCodeAluReg));
-            Set("0100110001001x", InstEmit.Shl,    typeof(OpCodeAluCbuf));
-            Set("0011100x01001x", InstEmit.Shl,    typeof(OpCodeAluImm));
-            Set("0101110001001x", InstEmit.Shl,    typeof(OpCodeAluReg));
-            Set("0100110000101x", InstEmit.Shr,    typeof(OpCodeAluCbuf));
-            Set("0011100x00101x", InstEmit.Shr,    typeof(OpCodeAluImm));
-            Set("0101110000101x", InstEmit.Shr,    typeof(OpCodeAluReg));
-            Set("111000101001xx", InstEmit.Ssy,    typeof(OpCodeSsy));
-            Set("1110111101010x", InstEmit.St,     typeof(OpCodeMemory));
-            Set("1110111011011x", InstEmit.Stg,    typeof(OpCodeMemory));
-            Set("11101011001xxx", InstEmit.Sust,   typeof(OpCodeImage));
-            Set("1111000011111x", InstEmit.Sync,   typeof(OpCodeSync));
-            Set("110000xxxx111x", InstEmit.Tex,    typeof(OpCodeTex));
-            Set("1101111010111x", InstEmit.TexB,   typeof(OpCodeTexB));
-            Set("1101x00xxxxxxx", InstEmit.Texs,   typeof(OpCodeTexs));
-            Set("1101x01xxxxxxx", InstEmit.Texs,   typeof(OpCodeTlds));
-            Set("1101x11100xxxx", InstEmit.Texs,   typeof(OpCodeTld4s));
-            Set("11011100xx111x", InstEmit.Tld,    typeof(OpCodeTld));
-            Set("11011101xx111x", InstEmit.TldB,   typeof(OpCodeTld));
-            Set("110010xxxx111x", InstEmit.Tld4,   typeof(OpCodeTld4));
-            Set("1101111101001x", InstEmit.Txq,    typeof(OpCodeTex));
-            Set("1101111101010x", InstEmit.TxqB,   typeof(OpCodeTex));
-            Set("01011111xxxxxx", InstEmit.Vmad,   typeof(OpCodeVideo));
-            Set("0100111xxxxxxx", InstEmit.Xmad,   typeof(OpCodeAluCbuf));
-            Set("0011011x00xxxx", InstEmit.Xmad,   typeof(OpCodeAluImm));
-            Set("010100010xxxxx", InstEmit.Xmad,   typeof(OpCodeAluRegCbuf));
-            Set("0101101100xxxx", InstEmit.Xmad,   typeof(OpCodeAluReg));
+            Set("1110111111011x", InstEmit.Ald,     typeof(OpCodeAttribute));
+            Set("1110111111110x", InstEmit.Ast,     typeof(OpCodeAttribute));
+            Set("0100110000000x", InstEmit.Bfe,     typeof(OpCodeAluCbuf));
+            Set("0011100x00000x", InstEmit.Bfe,     typeof(OpCodeAluImm));
+            Set("0101110000000x", InstEmit.Bfe,     typeof(OpCodeAluReg));
+            Set("0100101111110x", InstEmit.Bfi,     typeof(OpCodeAluCbuf));
+            Set("0011011x11110x", InstEmit.Bfi,     typeof(OpCodeAluImm));
+            Set("0101001111110x", InstEmit.Bfi,     typeof(OpCodeAluRegCbuf));
+            Set("0101101111110x", InstEmit.Bfi,     typeof(OpCodeAluReg));
+            Set("111000100100xx", InstEmit.Bra,     typeof(OpCodeBranch));
+            Set("111000110100xx", InstEmit.Brk,     typeof(OpCodeSync));
+            Set("0101000010100x", InstEmit.Csetp,   typeof(OpCodePsetp));
+            Set("111000110000xx", InstEmit.Exit,    typeof(OpCodeExit));
+            Set("0100110010101x", InstEmit.F2F,     typeof(OpCodeFArithCbuf));
+            Set("0011100x10101x", InstEmit.F2F,     typeof(OpCodeFArithImm));
+            Set("0101110010101x", InstEmit.F2F,     typeof(OpCodeFArithReg));
+            Set("0100110010110x", InstEmit.F2I,     typeof(OpCodeFArithCbuf));
+            Set("0011100x10110x", InstEmit.F2I,     typeof(OpCodeFArithImm));
+            Set("0101110010110x", InstEmit.F2I,     typeof(OpCodeFArithReg));
+            Set("0100110001011x", InstEmit.Fadd,    typeof(OpCodeFArithCbuf));
+            Set("0011100x01011x", InstEmit.Fadd,    typeof(OpCodeFArithImm));
+            Set("000010xxxxxxxx", InstEmit.Fadd,    typeof(OpCodeFArithImm32));
+            Set("0101110001011x", InstEmit.Fadd,    typeof(OpCodeFArithReg));
+            Set("010010011xxxxx", InstEmit.Ffma,    typeof(OpCodeFArithCbuf));
+            Set("0011001x1xxxxx", InstEmit.Ffma,    typeof(OpCodeFArithImm));
+            Set("010100011xxxxx", InstEmit.Ffma,    typeof(OpCodeFArithRegCbuf));
+            Set("010110011xxxxx", InstEmit.Ffma,    typeof(OpCodeFArithReg));
+            Set("0100110000110x", InstEmit.Flo,     typeof(OpCodeAluCbuf));
+            Set("0011100x00110x", InstEmit.Flo,     typeof(OpCodeAluImm));
+            Set("0101110000110x", InstEmit.Flo,     typeof(OpCodeAluReg));
+            Set("0100110001100x", InstEmit.Fmnmx,   typeof(OpCodeFArithCbuf));
+            Set("0011100x01100x", InstEmit.Fmnmx,   typeof(OpCodeFArithImm));
+            Set("0101110001100x", InstEmit.Fmnmx,   typeof(OpCodeFArithReg));
+            Set("0100110001101x", InstEmit.Fmul,    typeof(OpCodeFArithCbuf));
+            Set("0011100x01101x", InstEmit.Fmul,    typeof(OpCodeFArithImm));
+            Set("00011110xxxxxx", InstEmit.Fmul,    typeof(OpCodeFArithImm32));
+            Set("0101110001101x", InstEmit.Fmul,    typeof(OpCodeFArithReg));
+            Set("0100100xxxxxxx", InstEmit.Fset,    typeof(OpCodeSetCbuf));
+            Set("0011000xxxxxxx", InstEmit.Fset,    typeof(OpCodeFsetImm));
+            Set("01011000xxxxxx", InstEmit.Fset,    typeof(OpCodeSetReg));
+            Set("010010111011xx", InstEmit.Fsetp,   typeof(OpCodeSetCbuf));
+            Set("0011011x1011xx", InstEmit.Fsetp,   typeof(OpCodeFsetImm));
+            Set("010110111011xx", InstEmit.Fsetp,   typeof(OpCodeSetReg));
+            Set("0101000011111x", InstEmit.Fswzadd, typeof(OpCodeAluReg));
+            Set("0111101x1xxxxx", InstEmit.Hadd2,   typeof(OpCodeAluCbuf));
+            Set("0111101x0xxxxx", InstEmit.Hadd2,   typeof(OpCodeAluImm2x10));
+            Set("0010110xxxxxxx", InstEmit.Hadd2,   typeof(OpCodeAluImm32));
+            Set("0101110100010x", InstEmit.Hadd2,   typeof(OpCodeAluReg));
+            Set("01110xxx1xxxxx", InstEmit.Hfma2,   typeof(OpCodeHfmaCbuf));
+            Set("01110xxx0xxxxx", InstEmit.Hfma2,   typeof(OpCodeHfmaImm2x10));
+            Set("0010100xxxxxxx", InstEmit.Hfma2,   typeof(OpCodeHfmaImm32));
+            Set("0101110100000x", InstEmit.Hfma2,   typeof(OpCodeHfmaReg));
+            Set("01100xxx1xxxxx", InstEmit.Hfma2,   typeof(OpCodeHfmaRegCbuf));
+            Set("0111100x1xxxxx", InstEmit.Hmul2,   typeof(OpCodeAluCbuf));
+            Set("0111100x0xxxxx", InstEmit.Hmul2,   typeof(OpCodeAluImm2x10));
+            Set("0010101xxxxxxx", InstEmit.Hmul2,   typeof(OpCodeAluImm32));
+            Set("0101110100001x", InstEmit.Hmul2,   typeof(OpCodeAluReg));
+            Set("0111111x1xxxxx", InstEmit.Hsetp2,  typeof(OpCodeSetCbuf));
+            Set("0111111x0xxxxx", InstEmit.Hsetp2,  typeof(OpCodeHsetImm2x10));
+            Set("0101110100100x", InstEmit.Hsetp2,  typeof(OpCodeSetReg));
+            Set("0100110010111x", InstEmit.I2F,     typeof(OpCodeAluCbuf));
+            Set("0011100x10111x", InstEmit.I2F,     typeof(OpCodeAluImm));
+            Set("0101110010111x", InstEmit.I2F,     typeof(OpCodeAluReg));
+            Set("0100110011100x", InstEmit.I2I,     typeof(OpCodeAluCbuf));
+            Set("0011100x11100x", InstEmit.I2I,     typeof(OpCodeAluImm));
+            Set("0101110011100x", InstEmit.I2I,     typeof(OpCodeAluReg));
+            Set("0100110000010x", InstEmit.Iadd,    typeof(OpCodeAluCbuf));
+            Set("0011100000010x", InstEmit.Iadd,    typeof(OpCodeAluImm));
+            Set("0001110x0xxxxx", InstEmit.Iadd,    typeof(OpCodeAluImm32));
+            Set("0101110000010x", InstEmit.Iadd,    typeof(OpCodeAluReg));
+            Set("010011001100xx", InstEmit.Iadd3,   typeof(OpCodeAluCbuf));
+            Set("001110001100xx", InstEmit.Iadd3,   typeof(OpCodeAluImm));
+            Set("010111001100xx", InstEmit.Iadd3,   typeof(OpCodeAluReg));
+            Set("0100110000100x", InstEmit.Imnmx,   typeof(OpCodeAluCbuf));
+            Set("0011100x00100x", InstEmit.Imnmx,   typeof(OpCodeAluImm));
+            Set("0101110000100x", InstEmit.Imnmx,   typeof(OpCodeAluReg));
+            Set("11100000xxxxxx", InstEmit.Ipa,     typeof(OpCodeIpa));
+            Set("1110111111010x", InstEmit.Isberd,  typeof(OpCodeAlu));
+            Set("0100110000011x", InstEmit.Iscadd,  typeof(OpCodeAluCbuf));
+            Set("0011100x00011x", InstEmit.Iscadd,  typeof(OpCodeAluImm));
+            Set("000101xxxxxxxx", InstEmit.Iscadd,  typeof(OpCodeAluImm32));
+            Set("0101110000011x", InstEmit.Iscadd,  typeof(OpCodeAluReg));
+            Set("010010110101xx", InstEmit.Iset,    typeof(OpCodeSetCbuf));
+            Set("001101100101xx", InstEmit.Iset,    typeof(OpCodeSetImm));
+            Set("010110110101xx", InstEmit.Iset,    typeof(OpCodeSetReg));
+            Set("010010110110xx", InstEmit.Isetp,   typeof(OpCodeSetCbuf));
+            Set("0011011x0110xx", InstEmit.Isetp,   typeof(OpCodeSetImm));
+            Set("010110110110xx", InstEmit.Isetp,   typeof(OpCodeSetReg));
+            Set("111000110011xx", InstEmit.Kil,     typeof(OpCodeExit));
+            Set("1110111101000x", InstEmit.Ld,      typeof(OpCodeMemory));
+            Set("1110111110010x", InstEmit.Ldc,     typeof(OpCodeLdc));
+            Set("1110111011010x", InstEmit.Ldg,     typeof(OpCodeMemory));
+            Set("0100110001000x", InstEmit.Lop,     typeof(OpCodeLopCbuf));
+            Set("0011100001000x", InstEmit.Lop,     typeof(OpCodeLopImm));
+            Set("000001xxxxxxxx", InstEmit.Lop,     typeof(OpCodeLopImm32));
+            Set("0101110001000x", InstEmit.Lop,     typeof(OpCodeLopReg));
+            Set("0010000xxxxxxx", InstEmit.Lop3,    typeof(OpCodeLopCbuf));
+            Set("001111xxxxxxxx", InstEmit.Lop3,    typeof(OpCodeLopImm));
+            Set("0101101111100x", InstEmit.Lop3,    typeof(OpCodeLopReg));
+            Set("0100110010011x", InstEmit.Mov,     typeof(OpCodeAluCbuf));
+            Set("0011100x10011x", InstEmit.Mov,     typeof(OpCodeAluImm));
+            Set("000000010000xx", InstEmit.Mov,     typeof(OpCodeAluImm32));
+            Set("0101110010011x", InstEmit.Mov,     typeof(OpCodeAluReg));
+            Set("0101000010000x", InstEmit.Mufu,    typeof(OpCodeFArith));
+            Set("1111101111100x", InstEmit.Out,     typeof(OpCode));
+            Set("111000101010xx", InstEmit.Pbk,     typeof(OpCodeSsy));
+            Set("0101000010010x", InstEmit.Psetp,   typeof(OpCodePsetp));
+            Set("0100110010010x", InstEmit.Rro,     typeof(OpCodeFArithCbuf));
+            Set("0011100x10010x", InstEmit.Rro,     typeof(OpCodeFArithImm));
+            Set("0101110010010x", InstEmit.Rro,     typeof(OpCodeFArithReg));
+            Set("1111000011001x", InstEmit.S2r,     typeof(OpCodeAlu));
+            Set("0100110010100x", InstEmit.Sel,     typeof(OpCodeAluCbuf));
+            Set("0011100x10100x", InstEmit.Sel,     typeof(OpCodeAluImm));
+            Set("0101110010100x", InstEmit.Sel,     typeof(OpCodeAluReg));
+            Set("1110111100010x", InstEmit.Shfl,    typeof(OpCodeShuffle));
+            Set("0100110001001x", InstEmit.Shl,     typeof(OpCodeAluCbuf));
+            Set("0011100x01001x", InstEmit.Shl,     typeof(OpCodeAluImm));
+            Set("0101110001001x", InstEmit.Shl,     typeof(OpCodeAluReg));
+            Set("0100110000101x", InstEmit.Shr,     typeof(OpCodeAluCbuf));
+            Set("0011100x00101x", InstEmit.Shr,     typeof(OpCodeAluImm));
+            Set("0101110000101x", InstEmit.Shr,     typeof(OpCodeAluReg));
+            Set("111000101001xx", InstEmit.Ssy,     typeof(OpCodeSsy));
+            Set("1110111101010x", InstEmit.St,      typeof(OpCodeMemory));
+            Set("1110111011011x", InstEmit.Stg,     typeof(OpCodeMemory));
+            Set("11101011001xxx", InstEmit.Sust,    typeof(OpCodeImage));
+            Set("1111000011111x", InstEmit.Sync,    typeof(OpCodeSync));
+            Set("110000xxxx111x", InstEmit.Tex,     typeof(OpCodeTex));
+            Set("1101111010111x", InstEmit.TexB,    typeof(OpCodeTexB));
+            Set("1101x00xxxxxxx", InstEmit.Texs,    typeof(OpCodeTexs));
+            Set("1101x01xxxxxxx", InstEmit.Texs,    typeof(OpCodeTlds));
+            Set("11011111x0xxxx", InstEmit.Texs,    typeof(OpCodeTld4s));
+            Set("11011100xx111x", InstEmit.Tld,     typeof(OpCodeTld));
+            Set("11011101xx111x", InstEmit.TldB,    typeof(OpCodeTld));
+            Set("110010xxxx111x", InstEmit.Tld4,    typeof(OpCodeTld4));
+            Set("110111100x1110", InstEmit.Txd,     typeof(OpCodeTxd));
+            Set("1101111101001x", InstEmit.Txq,     typeof(OpCodeTex));
+            Set("1101111101010x", InstEmit.TxqB,    typeof(OpCodeTex));
+            Set("01011111xxxxxx", InstEmit.Vmad,    typeof(OpCodeVideo));
+            Set("0100111xxxxxxx", InstEmit.Xmad,    typeof(OpCodeAluCbuf));
+            Set("0011011x00xxxx", InstEmit.Xmad,    typeof(OpCodeAluImm));
+            Set("010100010xxxxx", InstEmit.Xmad,    typeof(OpCodeAluRegCbuf));
+            Set("0101101100xxxx", InstEmit.Xmad,    typeof(OpCodeAluReg));
 #endregion
         }
 
diff --git a/Ryujinx.Graphics.Shader/Decoders/OpCodeTextureScalar.cs b/Ryujinx.Graphics.Shader/Decoders/OpCodeTextureScalar.cs
index 1c175e30..543f8d13 100644
--- a/Ryujinx.Graphics.Shader/Decoders/OpCodeTextureScalar.cs
+++ b/Ryujinx.Graphics.Shader/Decoders/OpCodeTextureScalar.cs
@@ -39,7 +39,7 @@ namespace Ryujinx.Graphics.Shader.Decoders
 
         protected int RawType;
 
-        public bool IsFp16 { get; }
+        public bool IsFp16 { get; protected set; }
 
         public OpCodeTextureScalar(InstEmitter emitter, ulong address, long opCode) : base(emitter, address, opCode)
         {
diff --git a/Ryujinx.Graphics.Shader/Decoders/OpCodeTld4s.cs b/Ryujinx.Graphics.Shader/Decoders/OpCodeTld4s.cs
index 7e51a9e5..fd3240a0 100644
--- a/Ryujinx.Graphics.Shader/Decoders/OpCodeTld4s.cs
+++ b/Ryujinx.Graphics.Shader/Decoders/OpCodeTld4s.cs
@@ -16,6 +16,8 @@ namespace Ryujinx.Graphics.Shader.Decoders
 
             GatherCompIndex = opCode.Extract(52, 2);
 
+            IsFp16 = opCode.Extract(55);
+
             ComponentMask = Rd1.IsRZ ? 3 : 0xf;
         }
     }
diff --git a/Ryujinx.Graphics.Shader/Decoders/OpCodeTxd.cs b/Ryujinx.Graphics.Shader/Decoders/OpCodeTxd.cs
new file mode 100644
index 00000000..25df1f81
--- /dev/null
+++ b/Ryujinx.Graphics.Shader/Decoders/OpCodeTxd.cs
@@ -0,0 +1,18 @@
+using Ryujinx.Graphics.Shader.Instructions;
+
+namespace Ryujinx.Graphics.Shader.Decoders
+{
+    class OpCodeTxd : OpCodeTexture
+    {
+        public bool IsBindless { get; }
+
+        public OpCodeTxd(InstEmitter emitter, ulong address, long opCode) : base(emitter, address, opCode)
+        {
+            HasOffset = opCode.Extract(35);
+
+            IsBindless = opCode.Extract(54);
+
+            LodMode = TextureLodMode.None;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/Decoders/ShuffleType.cs b/Ryujinx.Graphics.Shader/Decoders/ShuffleType.cs
new file mode 100644
index 00000000..2892c8dd
--- /dev/null
+++ b/Ryujinx.Graphics.Shader/Decoders/ShuffleType.cs
@@ -0,0 +1,10 @@
+namespace Ryujinx.Graphics.Shader.Decoders
+{
+    enum ShuffleType
+    {
+        Indexed   = 0,
+        Up        = 1,
+        Down      = 2,
+        Butterfly = 3
+    }
+}
\ No newline at end of file
diff --git a/Ryujinx.Graphics.Shader/Decoders/SystemRegister.cs b/Ryujinx.Graphics.Shader/Decoders/SystemRegister.cs
index 1f51d93c..2f3f4492 100644
--- a/Ryujinx.Graphics.Shader/Decoders/SystemRegister.cs
+++ b/Ryujinx.Graphics.Shader/Decoders/SystemRegister.cs
@@ -2,12 +2,13 @@ namespace Ryujinx.Graphics.Shader.Decoders
 {
     enum SystemRegister
     {
-        ThreadId  = 0x20,
-        ThreadIdX = 0x21,
-        ThreadIdY = 0x22,
-        ThreadIdZ = 0x23,
-        CtaIdX    = 0x25,
-        CtaIdY    = 0x26,
-        CtaIdZ    = 0x27
+        YDirection = 0x12,
+        ThreadId   = 0x20,
+        ThreadIdX  = 0x21,
+        ThreadIdY  = 0x22,
+        ThreadIdZ  = 0x23,
+        CtaIdX     = 0x25,
+        CtaIdY     = 0x26,
+        CtaIdZ     = 0x27
     }
 }
\ No newline at end of file