From afcdd269486fdf5e659fd89a0697e2c501f4e070 Mon Sep 17 00:00:00 2001
From: offtkp <parisoplop@gmail.com>
Date: Mon, 2 Sep 2024 02:20:29 +0300
Subject: [PATCH] Set CF correctly on BLSR patch

---
 src/core/cpu_patches.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/core/cpu_patches.cpp b/src/core/cpu_patches.cpp
index 151d34986..5021616c5 100644
--- a/src/core/cpu_patches.cpp
+++ b/src/core/cpu_patches.cpp
@@ -339,9 +339,26 @@ static void GenerateBLSR(const ZydisDecodedOperand* operands, Xbyak::CodeGenerat
 
     SaveRegisters(c, {scratch});
 
+    Xbyak::Label set_carry, clear_carry, end;
+
+    // BLSR sets CF to zero if source is NOT zero, otherwise it sets CF to one.
     c.mov(scratch, *src);
+    c.test(scratch, scratch);
+    c.jz(set_carry);
+    c.jmp(clear_carry);
+
+    c.L(set_carry);
     c.dec(scratch);
     c.and_(scratch, *src);
+    c.stc();
+    c.jmp(end);
+
+    c.L(clear_carry);
+    c.dec(scratch);
+    c.and_(scratch, *src);
+    // We don't need to clear carry here since AND does that for us
+
+    c.L(end);
     c.mov(dst, scratch);
 
     RestoreRegisters(c, {scratch});