From 35843f8848cbeccad9f1ff2c9db640f84460aad6 Mon Sep 17 00:00:00 2001
From: Briar <205427297+icybriarr@users.noreply.github.com>
Date: Wed, 2 Apr 2025 19:39:03 +0200
Subject: [PATCH] externals: Downgrade dynarmic to `ae99622` and xbyak to
 `0d67fd15`; modify ABI parameter handling in macro_jit_x64.cpp

---
 externals/dynarmic                     | 2 +-
 externals/xbyak                        | 2 +-
 src/video_core/macro/macro_jit_x64.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/externals/dynarmic b/externals/dynarmic
index 5ae5288f4f..ae9962226e 160000
--- a/externals/dynarmic
+++ b/externals/dynarmic
@@ -1 +1 @@
-Subproject commit 5ae5288f4fbab522c7d50f6b818ebbaae476e98e
+Subproject commit ae9962226e65e2b6d5f85141de4d31fa958f669a
diff --git a/externals/xbyak b/externals/xbyak
index 44a72f3692..0d67fd1530 160000
--- a/externals/xbyak
+++ b/externals/xbyak
@@ -1 +1 @@
-Subproject commit 44a72f369268f7d552650891b296693e91db86bb
+Subproject commit 0d67fd1530016b7c56f3cd74b3fca920f4c3e2b4
diff --git a/src/video_core/macro/macro_jit_x64.cpp b/src/video_core/macro/macro_jit_x64.cpp
index 7347cbd887..14f265ad71 100644
--- a/src/video_core/macro/macro_jit_x64.cpp
+++ b/src/video_core/macro/macro_jit_x64.cpp
@@ -352,8 +352,8 @@ void Send(Engines::Maxwell3D* maxwell3d, Macro::MethodAddress method_address, u3
 void MacroJITx64Impl::Compile_Send(Xbyak::Reg32 value) {
     Common::X64::ABI_PushRegistersAndAdjustStack(*this, PersistentCallerSavedRegs(), 0);
     mov(Common::X64::ABI_PARAM1, qword[STATE]);
-    mov(Common::X64::ABI_PARAM2, METHOD_ADDRESS);
-    mov(Common::X64::ABI_PARAM3, value);
+    mov(Common::X64::ABI_PARAM2.cvt32(), METHOD_ADDRESS);
+    mov(Common::X64::ABI_PARAM3.cvt32(), value);
     Common::X64::CallFarFunction(*this, &Send);
     Common::X64::ABI_PopRegistersAndAdjustStack(*this, PersistentCallerSavedRegs(), 0);