Skip to content

Commit

Permalink
fixed/updated x86 too
Browse files Browse the repository at this point in the history
  • Loading branch information
maxmuen committed Nov 29, 2022
1 parent 1e2123b commit 09bd18e
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions src/detour_x86.cc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
#include <Zydis/Zydis.h>
#include <asmjit/asmjit.h>

#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <Memoryapi.h>

namespace meow_hook::detail
{
Expand Down Expand Up @@ -154,7 +157,8 @@ void detour_base::hook()
}

asmjit::CodeHolder trampoline_code;
asmjit::CodeInfo ci{asmjit::ArchInfo::kIdX86};
auto environment = asmjit::Environment::host();
environment.setArch(asmjit::Arch::kX86);

constexpr auto kRequired64bitJumpSize = 17;
constexpr auto kRelocationEntrySize = 5; // 5 is 32 bit relative jump
Expand All @@ -166,8 +170,7 @@ void detour_base::hook()
if (trampoline_2gb) {
using namespace asmjit::x86;

ci.setBaseAddress(reinterpret_cast<uintptr_t>(trampoline_2gb));
trampoline_code.init(ci);
trampoline_code.init(environment, reinterpret_cast<uintptr_t>(trampoline_2gb));

asmjit::x86::Assembler trampoline_assembler(&trampoline_code);

Expand Down Expand Up @@ -207,8 +210,7 @@ void detour_base::hook()

using namespace asmjit::x86;

ci.setBaseAddress(reinterpret_cast<uintptr_t>(trampoline_2gb));
trampoline_code.init(ci);
trampoline_code.init(environment, reinterpret_cast<uintptr_t>(trampoline_2gb));

asmjit::x86::Assembler trampoline_assembler(&trampoline_code);

Expand Down Expand Up @@ -241,9 +243,9 @@ std::vector<uint8_t> detour_base::create_absolute_jump() const
using namespace asmjit::x86;

asmjit::CodeHolder jump_code;
asmjit::CodeInfo ci(asmjit::ArchInfo::kIdX86);
ci.setBaseAddress(address_);
jump_code.init(ci);
auto environment = asmjit::Environment::host();
environment.setArch(asmjit::Arch::kX86);
jump_code.init(environment, address_);

asmjit::x86::Assembler jump_assembler(&jump_code);

Expand Down

0 comments on commit 09bd18e

Please sign in to comment.