From 70efc05fa9cb54d48a685ec9e20597fec124d86d Mon Sep 17 00:00:00 2001
From: "Herman S." <429230+has207@users.noreply.github.com>
Date: Wed, 3 Dec 2025 08:20:10 +0900
Subject: [PATCH] Revert "Revert xbyak"

This reverts commit 34634201d357d68456ef6570496e72f7aa3b2a9c.
---
 src/xenia/cpu/backend/x64/x64_backend.cc | 2 +-
 src/xenia/cpu/backend/x64/x64_emitter.cc | 2 +-
 third_party/xbyak                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/xenia/cpu/backend/x64/x64_backend.cc b/src/xenia/cpu/backend/x64/x64_backend.cc
index 4b7d0e089..4c9e3a692 100644
--- a/src/xenia/cpu/backend/x64/x64_backend.cc
+++ b/src/xenia/cpu/backend/x64/x64_backend.cc
@@ -1408,7 +1408,7 @@ void* X64HelperEmitter::EmitFrsqrteHelper() {
   je(L25, CodeGenerator::T_NEAR);
 
   L(L9);
-  lea(edx, ptr[0 + rcx * 8]);
+  lea(edx, ptr[rcx * 8]);
   shr(rax, 49);
   sub(ecx, 1023);
   and_(edx, 8);
diff --git a/src/xenia/cpu/backend/x64/x64_emitter.cc b/src/xenia/cpu/backend/x64/x64_emitter.cc
index 1464789b7..6af886f8a 100644
--- a/src/xenia/cpu/backend/x64/x64_emitter.cc
+++ b/src/xenia/cpu/backend/x64/x64_emitter.cc
@@ -1774,7 +1774,7 @@ void X64Emitter::PushStackpoint() {
 
   mov(qword[rbx + offsetof(X64BackendStackpoint, host_stack_)], rsp);
   mov(dword[rbx + offsetof(X64BackendStackpoint, guest_stack_)], r8d);
-  mov(r8d, qword[GetContextReg() + offsetof(ppc::PPCContext, lr)]);
+  mov(r8d, dword[GetContextReg() + offsetof(ppc::PPCContext, lr)]);
   mov(dword[rbx + offsetof(X64BackendStackpoint, guest_return_address_)], r8d);
 
   if (IsFeatureEnabled(kX64FlagsIndependentVars)) {
diff --git a/third_party/xbyak b/third_party/xbyak
index 4e44f4614..9d8ff3730 160000
--- a/third_party/xbyak
+++ b/third_party/xbyak
@@ -1 +1 @@
-Subproject commit 4e44f4614ddbf038f2a6296f5b906d5c72691e0f
+Subproject commit 9d8ff37306f39c6a71cf998078cbe880ce5dc224