From fecbf091e5d4ef21d18c1c4bf4f94461d5a82d64 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Mon, 15 Oct 2018 21:01:57 +0100
Subject: [PATCH] Jit_FloatingPoint: fselx

---
 .../Core/PowerPC/Jit64/Jit_FloatingPoint.cpp  | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp
index c74db0dbf5..6345f47b87 100644
--- a/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp
+++ b/Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp
@@ -417,35 +417,38 @@ void Jit64::fselx(UGeckoInstruction inst)
 
   bool packed = inst.OPCD == 4;  // ps_sel
 
-  fpr.Lock(a, b, c, d);
+  RCOpArg Ra = fpr.Use(a, RCMode::Read);
+  RCOpArg Rb = fpr.Use(b, RCMode::Read);
+  RCOpArg Rc = fpr.Use(c, RCMode::Read);
+  RCX64Reg Rd = fpr.Bind(d, packed ? RCMode::Write : RCMode::ReadWrite);
+  RegCache::Realize(Ra, Rb, Rc, Rd);
+
   XORPD(XMM0, R(XMM0));
   // This condition is very tricky; there's only one right way to handle both the case of
   // negative/positive zero and NaN properly.
   // (a >= -0.0 ? c : b) transforms into (0 > a ? b : c), hence the NLE.
   if (packed)
-    CMPPD(XMM0, fpr.R(a), CMP_NLE);
+    CMPPD(XMM0, Ra, CMP_NLE);
   else
-    CMPSD(XMM0, fpr.R(a), CMP_NLE);
+    CMPSD(XMM0, Ra, CMP_NLE);
 
   if (cpu_info.bSSE4_1)
   {
-    MOVAPD(XMM1, fpr.R(c));
-    BLENDVPD(XMM1, fpr.R(b));
+    MOVAPD(XMM1, Rc);
+    BLENDVPD(XMM1, Rb);
   }
   else
   {
     MOVAPD(XMM1, R(XMM0));
-    ANDPD(XMM0, fpr.R(b));
-    ANDNPD(XMM1, fpr.R(c));
+    ANDPD(XMM0, Rb);
+    ANDNPD(XMM1, Rc);
     ORPD(XMM1, R(XMM0));
   }
 
-  fpr.BindToRegister(d, !packed);
   if (packed)
-    MOVAPD(fpr.RX(d), R(XMM1));
+    MOVAPD(Rd, R(XMM1));
   else
-    MOVSD(fpr.RX(d), R(XMM1));
-  fpr.UnlockAll();
+    MOVSD(Rd, R(XMM1));
 }
 
 void Jit64::fmrx(UGeckoInstruction inst)