From 42d49426e8962924ace0942db76aa47b4b622b12 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Thu, 3 Sep 2020 00:10:27 +1000
Subject: [PATCH] CPU/Recompiler/AArch64: Fix crash when calling >26-bit away
 functions

---
 .../cpu_recompiler_code_generator_aarch64.cpp | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/core/cpu_recompiler_code_generator_aarch64.cpp b/src/core/cpu_recompiler_code_generator_aarch64.cpp
index de2f8ec3c..4a62184ab 100644
--- a/src/core/cpu_recompiler_code_generator_aarch64.cpp
+++ b/src/core/cpu_recompiler_code_generator_aarch64.cpp
@@ -18,6 +18,7 @@ constexpr HostReg RARG1 = 0;
 constexpr HostReg RARG2 = 1;
 constexpr HostReg RARG3 = 2;
 constexpr HostReg RARG4 = 3;
+constexpr HostReg RSCRATCH = 8;
 constexpr u64 FUNCTION_CALL_STACK_ALIGNMENT = 16;
 constexpr u64 FUNCTION_CALL_SHADOW_SPACE = 32;
 constexpr u64 FUNCTION_CALLEE_SAVED_SPACE_RESERVE = 80;  // 8 registers
@@ -125,7 +126,7 @@ void CodeGenerator::InitHostRegs()
   // TODO: function calls mess up the parameter registers if we use them.. fix it
   // allocate nonvolatile before volatile
   m_register_cache.SetHostRegAllocationOrder(
-    {19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17});
+    {19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 4, 5, 6, 7, 9, 10, 11, 12, 13, 14, 15, 16, 17});
   m_register_cache.SetCallerSavedHostRegs({0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17});
   m_register_cache.SetCalleeSavedHostRegs({19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 30});
   m_register_cache.SetCPUPtrHostReg(RCPUPTR);
@@ -977,8 +978,8 @@ void CodeGenerator::EmitFunctionCallPtr(Value* return_value, const void* ptr)
   const bool use_blr = !vixl::IsInt26(displacement);
   if (use_blr)
   {
-    m_emit->Mov(GetHostReg64(RRETURN), reinterpret_cast<uintptr_t>(ptr));
-    m_emit->Blr(GetHostReg64(RRETURN));
+    m_emit->Mov(GetHostReg64(RSCRATCH), reinterpret_cast<uintptr_t>(ptr));
+    m_emit->Blr(GetHostReg64(RSCRATCH));
   }
   else
   {
@@ -1012,8 +1013,8 @@ void CodeGenerator::EmitFunctionCallPtr(Value* return_value, const void* ptr, co
   const bool use_blr = !vixl::IsInt26(displacement);
   if (use_blr)
   {
-    m_emit->Mov(GetHostReg64(RRETURN), reinterpret_cast<uintptr_t>(ptr));
-    m_emit->Blr(GetHostReg64(RRETURN));
+    m_emit->Mov(GetHostReg64(RSCRATCH), reinterpret_cast<uintptr_t>(ptr));
+    m_emit->Blr(GetHostReg64(RSCRATCH));
   }
   else
   {
@@ -1048,8 +1049,8 @@ void CodeGenerator::EmitFunctionCallPtr(Value* return_value, const void* ptr, co
   const bool use_blr = !vixl::IsInt26(displacement);
   if (use_blr)
   {
-    m_emit->Mov(GetHostReg64(RRETURN), reinterpret_cast<uintptr_t>(ptr));
-    m_emit->Blr(GetHostReg64(RRETURN));
+    m_emit->Mov(GetHostReg64(RSCRATCH), reinterpret_cast<uintptr_t>(ptr));
+    m_emit->Blr(GetHostReg64(RSCRATCH));
   }
   else
   {
@@ -1086,8 +1087,8 @@ void CodeGenerator::EmitFunctionCallPtr(Value* return_value, const void* ptr, co
   const bool use_blr = !vixl::IsInt26(displacement);
   if (use_blr)
   {
-    m_emit->Mov(GetHostReg64(RRETURN), reinterpret_cast<uintptr_t>(ptr));
-    m_emit->Blr(GetHostReg64(RRETURN));
+    m_emit->Mov(GetHostReg64(RSCRATCH), reinterpret_cast<uintptr_t>(ptr));
+    m_emit->Blr(GetHostReg64(RSCRATCH));
   }
   else
   {
@@ -1125,8 +1126,8 @@ void CodeGenerator::EmitFunctionCallPtr(Value* return_value, const void* ptr, co
   const bool use_blr = !vixl::IsInt26(displacement);
   if (use_blr)
   {
-    m_emit->Mov(GetHostReg64(RRETURN), reinterpret_cast<uintptr_t>(ptr));
-    m_emit->Blr(GetHostReg64(RRETURN));
+    m_emit->Mov(GetHostReg64(RSCRATCH), reinterpret_cast<uintptr_t>(ptr));
+    m_emit->Blr(GetHostReg64(RSCRATCH));
   }
   else
   {