Added S_ANDN2_B32 and S_NAND_B32 opcodes (#833)

* Added S_ANDN2_B32 and S_NAND_B32 opcodes * Update src/shader_recompiler/frontend/translate/scalar_alu.cpp Co-authored-by: baggins183 <[email protected]> * Fix result and src1 Co-authored-by: baggins183 <[email protected]> * update result Co-authored-by: baggins183 <[email protected]> * Update src1 Co-authored-by: baggins183 <[email protected]> --------- Co-authored-by: baggins183 <[email protected]>
shadps4-emu · Sep 9, 2024 · 4502a5d · 4502a5d
1 parent 411449c
commit 4502a5d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/src/shader_recompiler/frontend/translate/scalar_alu.cpp b/src/shader_recompiler/frontend/translate/scalar_alu.cpp
@@ -46,7 +46,11 @@ void Translator::EmitScalarAlu(const GcnInst& inst) {
         case Opcode::S_ADD_I32:
             return S_ADD_I32(inst);
         case Opcode::S_AND_B32:
-            return S_AND_B32(inst);
+            return S_AND_B32(NegateMode::None, inst);
+        case Opcode::S_NAND_B32:
+            return S_AND_B32(NegateMode::Result, inst);
+        case Opcode::S_ANDN2_B32:
+            return S_AND_B32(NegateMode::Src1, inst);
         case Opcode::S_ASHR_I32:
             return S_ASHR_I32(inst);
         case Opcode::S_OR_B32:
@@ -381,10 +385,16 @@ void Translator::S_ADD_I32(const GcnInst& inst) {
     // TODO: Overflow flag
 }
 
-void Translator::S_AND_B32(const GcnInst& inst) {
+void Translator::S_AND_B32(NegateMode negate, const GcnInst& inst) {
     const IR::U32 src0{GetSrc(inst.src[0])};
-    const IR::U32 src1{GetSrc(inst.src[1])};
-    const IR::U32 result{ir.BitwiseAnd(src0, src1)};
+    IR::U32 src1{GetSrc(inst.src[1])};
+    if (negate == NegateMode::Src1) {
+        src1 = ir.BitwiseNot(src1);
+    }
+    IR::U32 result{ir.BitwiseAnd(src0, src1)};
+    if (negate == NegateMode::Result) {
+        result = ir.BitwiseNot(result);
+    }
     SetDst(inst.dst[0], result);
     ir.SetScc(ir.INotEqual(result, ir.Imm32(0)));
 }

diff --git a/src/shader_recompiler/frontend/translate/translate.h b/src/shader_recompiler/frontend/translate/translate.h
@@ -84,7 +84,7 @@ class Translator {
     void S_OR_B64(NegateMode negate, bool is_xor, const GcnInst& inst);
     void S_AND_B64(NegateMode negate, const GcnInst& inst);
     void S_ADD_I32(const GcnInst& inst);
-    void S_AND_B32(const GcnInst& inst);
+    void S_AND_B32(NegateMode negate, const GcnInst& inst);
     void S_ASHR_I32(const GcnInst& inst);
     void S_OR_B32(const GcnInst& inst);
     void S_LSHR_B32(const GcnInst& inst);