From 5525f6c0a262f8c783c582d6eea7abd581641dee Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Thu, 5 Nov 2015 17:17:52 -0800
Subject: [PATCH] Tracking master xbyak.

---
 src/xenia/cpu/backend/x64/x64_emitter.cc | 3 ++-
 third_party/xbyak                        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/xenia/cpu/backend/x64/x64_emitter.cc b/src/xenia/cpu/backend/x64/x64_emitter.cc
index 731025ecd..c318035e8 100644
--- a/src/xenia/cpu/backend/x64/x64_emitter.cc
+++ b/src/xenia/cpu/backend/x64/x64_emitter.cc
@@ -543,7 +543,8 @@ void X64Emitter::CallNativeSafe(void* fn) {
 }
 
 void X64Emitter::SetReturnAddress(uint64_t value) {
-  mov(qword[rsp + StackLayout::GUEST_CALL_RET_ADDR], value);
+  mov(rax, value);
+  mov(qword[rsp + StackLayout::GUEST_CALL_RET_ADDR], rax);
 }
 
 void X64Emitter::ReloadECX() {
diff --git a/third_party/xbyak b/third_party/xbyak
index 4431caffb..7ba56efc5 160000
--- a/third_party/xbyak
+++ b/third_party/xbyak
@@ -1 +1 @@
-Subproject commit 4431caffbb0dec5a6d8538fff67a4a875953e1ab
+Subproject commit 7ba56efc538dd3020816c0a60ac535b3ea7d8543