From 2fb557d001be4c02069062d30fbe05ea3c155dd8 Mon Sep 17 00:00:00 2001
From: "Herman S." <429230+has207@users.noreply.github.com>
Date: Mon, 22 Sep 2025 19:49:01 +0900
Subject: [PATCH] Upgrade to xbyak v7.30 and fix compilation and runtime issues

---
 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 410fd7b78..78952f569 100644
--- a/src/xenia/cpu/backend/x64/x64_backend.cc
+++ b/src/xenia/cpu/backend/x64/x64_backend.cc
@@ -1404,7 +1404,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 d2dfa9e2c..860aacb64 100644
--- a/src/xenia/cpu/backend/x64/x64_emitter.cc
+++ b/src/xenia/cpu/backend/x64/x64_emitter.cc
@@ -1761,7 +1761,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 0d67fd153..9d8ff3730 160000
--- a/third_party/xbyak
+++ b/third_party/xbyak
@@ -1 +1 @@
-Subproject commit 0d67fd1530016b7c56f3cd74b3fca920f4c3e2b4
+Subproject commit 9d8ff37306f39c6a71cf998078cbe880ce5dc224