From 71e97665192ef45487262fcdd4df2286208e61cd Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Sat, 25 May 2024 17:35:42 +0200
Subject: [PATCH] JitArm64: Use BIC/EON/ORN in crXXX

This lets us save an instruction in certain scenarios.
---
 .../JitArm64/JitArm64_SystemRegisters.cpp     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
index 7be7740d61..91a048a353 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
@@ -636,10 +636,8 @@ void JitArm64::crXXX(UGeckoInstruction inst)
     }
   }
 
-  // crandc or crorc
-  const bool negate_b = inst.SUBOP10 == 129 || inst.SUBOP10 == 417;
-  // crnor or crnand or creqv
-  const bool negate_result = inst.SUBOP10 == 33 || inst.SUBOP10 == 225 || inst.SUBOP10 == 289;
+  // crnor or crnand
+  const bool negate_result = inst.SUBOP10 == 33 || inst.SUBOP10 == 225;
 
   auto WA = gpr.GetScopedReg();
   ARM64Reg XA = EncodeRegTo64(WA);
@@ -648,27 +646,36 @@ void JitArm64::crXXX(UGeckoInstruction inst)
     ARM64Reg XB = EncodeRegTo64(WB);
 
     GetCRFieldBit(inst.CRBA >> 2, 3 - (inst.CRBA & 3), XA, false);
-    GetCRFieldBit(inst.CRBB >> 2, 3 - (inst.CRBB & 3), XB, negate_b);
+    GetCRFieldBit(inst.CRBB >> 2, 3 - (inst.CRBB & 3), XB, false);
 
     // Compute combined bit
     switch (inst.SUBOP10)
     {
-    case 129:  // crandc: A && ~B
     case 225:  // crnand: ~(A && B)
     case 257:  // crand:  A && B
       AND(XA, XA, XB);
       break;
 
+    case 129:  // crandc: A && ~B
+      BIC(XA, XA, XB);
+      break;
+
     case 193:  // crxor: A ^ B
-    case 289:  // creqv: ~(A ^ B)
       EOR(XA, XA, XB);
       break;
 
+    case 289:  // creqv: ~(A ^ B) = A ^ ~B
+      EON(XA, XA, XB);
+      break;
+
     case 33:   // crnor: ~(A || B)
-    case 417:  // crorc: A || ~B
     case 449:  // cror:  A || B
       ORR(XA, XA, XB);
       break;
+
+    case 417:  // crorc: A || ~B
+      ORN(XA, XA, XB);
+      break;
     }
   }