From 6dd7b47e345d889ec925516db8f84deafa102558 Mon Sep 17 00:00:00 2001
From: praydog <praydog@praydog.com>
Date: Thu, 28 Mar 2024 15:59:10 -0700
Subject: [PATCH] HookManager: Simplify previous improvements with register
 storage

---
 src/HookManager.cpp | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/HookManager.cpp b/src/HookManager.cpp
index 2be6f38c6..f90b52b8d 100644
--- a/src/HookManager.cpp
+++ b/src/HookManager.cpp
@@ -334,6 +334,10 @@ void HookManager::create_jitted_facilitator(std::unique_ptr<HookManager::HookedF
     a.lea(rax, ptr(ret_label));
     a.mov(ptr(rsp), rax);
 
+    // Store off our HookStorage in RBX.
+    // RBX is safe if the called function respects the ABI.
+    a.mov(rbx, r10);
+
     // Determine if we need to skip the original function or not.
     a.cmp(r11, (int)PreHookResult::CALL_ORIGINAL);
     a.jnz(skip_label);
@@ -346,23 +350,8 @@ void HookManager::create_jitted_facilitator(std::unique_ptr<HookManager::HookedF
 
     a.bind(ret_label);
 
-    // Save return value.
-    //a.mov(rcx, ptr(ret_val_label));
-
-    a.push(rax); // store return value
-
-    a.mov(rcx, ptr(hook_label));
-
-    a.mov(rbx, rsp);
-    a.sub(rsp, STACK_STORAGE_AMOUNT);
-    a.and_(rsp, -16);
-    a.call(ptr(get_storage_label)); // rax is now storage
-
-    a.mov(rsp, rbx);
-
-    a.mov(r10, rax); // get storage -> r10
-    a.pop(rax); // restore return value
-
+    // Set hook storage back to R10.
+    a.mov(r10, rbx);
 
     constexpr auto ret_val_offset = offsetof(HookedFn::HookStorage, ret_val);
     //a.lea(rcx, ptr(r10, ret_val_offset));