Merge branch 'powerof3:dev' into dev-rex

powerof3 · Nov 15, 2024 · 92c1ee1 · 92c1ee1
2 parents 2b1d86c + 1b38981
commit 92c1ee1
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 0 deletions.
diff --git a/include/REL/Relocation.h b/include/REL/Relocation.h
@@ -323,6 +323,16 @@ namespace REL
 			safe_fill(address(), a_value, a_count);
 		}
 
+#ifdef SKSE_SUPPORT_XBYAK
+		void write_func(const std::size_t a_count, const std::uintptr_t a_dst) requires(std::same_as<value_type, std::uintptr_t>);
+
+		template <class F>
+		void write_func(const std::size_t a_count, const F a_dst) requires(std::same_as<value_type, std::uintptr_t>)
+		{
+			write_func(a_count, stl::unrestricted_cast<std::uintptr_t>(a_dst));
+		}
+#endif
+
 		template <class U = value_type>
 		std::uintptr_t write_vfunc(const std::size_t a_idx, const std::uintptr_t a_newFunc) requires(std::same_as<U, std::uintptr_t>)
 		{

diff --git a/src/REL/Relocation.cpp b/src/REL/Relocation.cpp
@@ -32,3 +32,33 @@ namespace REL
 		assert(success);
 	}
 }
+
+#ifdef SKSE_SUPPORT_XBYAK
+#	include <xbyak/xbyak.h>
+
+namespace REL
+{
+	struct write_func_impl : Xbyak::CodeGenerator
+	{
+		write_func_impl(std::uintptr_t a_dst)
+		{
+			Xbyak::Label dst;
+			jmp(ptr[rip + dst]);
+			L(dst);
+			dq(a_dst);
+		}
+	};
+
+	template <class T>
+	void Relocation<T>::write_func(const std::size_t a_count, const std::uintptr_t a_dst) requires(std::same_as<value_type, std::uintptr_t>)
+	{
+		safe_fill(address(), INT3, a_count);
+		auto patch = write_func_impl{ a_dst };
+		patch.ready();
+		assert(patch.getSize() <= a_count);
+		safe_write(address(), std::span{ patch.getCode<const std::byte*>(), patch.getSize() });
+	}
+
+	template void Relocation<std::uintptr_t>::write_func(const std::size_t, const std::uintptr_t);
+}
+#endif