Skip to content

Add support for x64 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
itsmeft24 wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Add support for x64 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bd6ed76
[cpp] Begin implementing basic x64 support
itsmeft24 Mar 19, 2025
c428a90
[cpp] Add extended inline hook support for x86.
itsmeft24 Mar 19, 2025
2eaa26c
[cpp] remove unused macro
itsmeft24 Mar 20, 2025
159c607
[cpp] fix typo in detail::relocate_code
itsmeft24 Jun 3, 2025
5e2cdcd
[rust] wip port of cpp library
itsmeft24 Jun 3, 2025
092d523
[rust] remove _new_decoder helper func
itsmeft24 Jun 3, 2025
6f4325c
[rust] add allow(dead_code) for MetaItem struct
itsmeft24 Jun 3, 2025
a6560cc
impl mov_u32 for cpp (x86 only)
itsmeft24 Jun 24, 2025
1207404
[rust] adjust `install_fn` to match new crate name
itsmeft24 Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
241 changes: 241 additions & 0 deletions cpp/backup_registers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,241 @@
#pragma once
#include <array>
namespace sunset {
namespace detail {
namespace x86 {

/*
pushad
pushfd
sub esp, 16
movdqu dqword [esp], xmm0
sub esp, 16
movdqu dqword [esp], xmm1
sub esp, 16
movdqu dqword [esp], xmm2
sub esp, 16
movdqu dqword [esp], xmm3
sub esp, 16
movdqu dqword [esp], xmm4
sub esp, 16
movdqu dqword [esp], xmm5
sub esp, 16
movdqu dqword [esp], xmm6
sub esp, 16
movdqu dqword [esp], xmm7
push esp
*/
constexpr std::array<std::uint8_t, 99> BACKUP_REGISTERS = { 0x60, 0x9C, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0x84, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0x8C, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0x94, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0x9C, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0xA4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0xAC, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0xB4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0xBC, 0x24, 0x00, 0x00, 0x00, 0x00, 0x54 };

/*
pushad
pushfd
push esp
*/
constexpr std::array<std::uint8_t, 3> BACKUP_GENERAL_REGISTERS = { 0x60, 0x9C, 0x54 };

/*
pop eax
movdqu xmm7, dqword [esp]
add esp, 16
movdqu xmm6, dqword [esp]
add esp, 16
movdqu xmm5, dqword [esp]
add esp, 16
movdqu xmm4, dqword [esp]
add esp, 16
movdqu xmm3, dqword [esp]
add esp, 16
movdqu xmm2, dqword [esp]
add esp, 16
movdqu xmm1, dqword [esp]
add esp, 16
movdqu xmm0, dqword [esp]
add esp, 16
popfd
popad
*/
constexpr std::array<std::uint8_t, 99> RESTORE_REGISTERS = { 0x58, 0xF3, 0x0F, 0x6F, 0xBC, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0xB4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0xAC, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0xA4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0x9C, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0x94, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0x8C, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0x84, 0x24, 0x00, 0x00, 0x00, 0x00, 0x83, 0xC4, 0x10, 0x9D, 0x61 };

/*
pop eax
popfd
popad
*/
constexpr std::array<std::uint8_t, 3> RESTORE_GENERAL_REGISTERS = { 0x58, 0x9D, 0x61 };
};
namespace x64 {

/*
push rax
mov rax, rsp
add rax, 8
push rcx
push rdx
push rbx
push rbp
push rax
push rsi
push rdi
push r8
push r9
push r10
push r11
push r12
push r13
push r14
push r15
pushfq
sub rsp, 16
movdqu dqword [rsp], xmm0
sub rsp, 16
movdqu dqword [rsp], xmm1
sub rsp, 16
movdqu dqword [rsp], xmm2
sub rsp, 16
movdqu dqword [rsp], xmm3
sub rsp, 16
movdqu dqword [rsp], xmm4
sub rsp, 16
movdqu dqword [rsp], xmm5
sub rsp, 16
movdqu dqword [rsp], xmm6
sub rsp, 16
movdqu dqword [rsp], xmm7
sub rsp, 16
movdqu dqword [rsp], xmm8
sub rsp, 16
movdqu dqword [rsp], xmm9
sub rsp, 16
movdqu dqword [rsp], xmm10
sub rsp, 16
movdqu dqword [rsp], xmm11
sub rsp, 16
movdqu dqword [rsp], xmm12
sub rsp, 16
movdqu dqword [rsp], xmm13
sub rsp, 16
movdqu dqword [rsp], xmm14
sub rsp, 16
movdqu dqword [rsp], xmm15
mov rcx, rsp
sub rsp, 8 // This extra sub rsp instruction is here since on x64, the stack must be 16-byte aligned before a function call.
*/

// Includes XMM registers
constexpr std::array<std::uint8_t, 255> BACKUP_REGISTERS = { 0x50, 0x48, 0x89, 0xE0, 0x48, 0x83, 0xC0, 0x08, 0x51, 0x52, 0x53, 0x55, 0x50, 0x56, 0x57, 0x41, 0x50, 0x41, 0x51, 0x41, 0x52, 0x41, 0x53, 0x41, 0x54, 0x41, 0x55, 0x41, 0x56, 0x41, 0x57, 0x9C, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0x84, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0x8C, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0x94, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0x9C, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0xA4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0xAC, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0xB4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x0F, 0x7F, 0xBC, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x44, 0x0F, 0x7F, 0x84, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x44, 0x0F, 0x7F, 0x8C, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x44, 0x0F, 0x7F, 0x94, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x44, 0x0F, 0x7F, 0x9C, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x44, 0x0F, 0x7F, 0xA4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x44, 0x0F, 0x7F, 0xAC, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x44, 0x0F, 0x7F, 0xB4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xEC, 0x10, 0xF3, 0x44, 0x0F, 0x7F, 0xBC, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x89, 0xE1, 0x48, 0x83, 0xEC, 0x08 };

/*
push rax
mov rax, rsp
add rax, 8
push rcx
push rdx
push rbx
push rbp
push rax
push rsi
push rdi
push r8
push r9
push r10
push r11
push r12
push r13
push r14
push r15
pushfq
mov rcx, rsp
sub rsp, 8 // This extra sub rsp instruction is here since on x64, the stack must be 16-byte aligned before a function call.
*/

// Omits XMM registers
constexpr std::array<std::uint8_t, 39> BACKUP_GENERAL_REGISTERS = { 0x50, 0x48, 0x89, 0xE0, 0x48, 0x83, 0xC0, 0x08, 0x51, 0x52, 0x53, 0x55, 0x50, 0x56, 0x57, 0x41, 0x50, 0x41, 0x51, 0x41, 0x52, 0x41, 0x53, 0x41, 0x54, 0x41, 0x55, 0x41, 0x56, 0x41, 0x57, 0x9C, 0x48, 0x89, 0xE1, 0x48, 0x83, 0xEC, 0x08 };

/*
add rsp, 8 // This extra add rsp instruction is here since the corresponding backup routine has an extra sub rsp instruction; used to ensure stack alignment.
movdqu xmm15, dqword [rsp]
add rsp, 16
movdqu xmm14, dqword [rsp]
add rsp, 16
movdqu xmm13, dqword [rsp]
add rsp, 16
movdqu xmm12, dqword [rsp]
add rsp, 16
movdqu xmm11, dqword [rsp]
add rsp, 16
movdqu xmm10, dqword [rsp]
add rsp, 16
movdqu xmm9, dqword [rsp]
add rsp, 16
movdqu xmm8, dqword [rsp]
add rsp, 16
movdqu xmm7, dqword [rsp]
add rsp, 16
movdqu xmm6, dqword [rsp]
add rsp, 16
movdqu xmm5, dqword [rsp]
add rsp, 16
movdqu xmm4, dqword [rsp]
add rsp, 16
movdqu xmm3, dqword [rsp]
add rsp, 16
movdqu xmm2, dqword [rsp]
add rsp, 16
movdqu xmm1, dqword [rsp]
add rsp, 16
movdqu xmm0, dqword [rsp]
add rsp, 16
popfq
pop r15
pop r14
pop r13
pop r12
pop r11
pop r10
pop r9
pop r8
pop rdi
pop rsi
add rsp, 8
pop rbp
pop rbx
pop rdx
pop rcx
pop rax
*/

// Includes XMM registers
constexpr std::array<std::uint8_t, 248> RESTORE_REGISTERS = { 0x48, 0x83, 0xC4, 0x08, 0xF3, 0x44, 0x0F, 0x6F, 0xBC, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x44, 0x0F, 0x6F, 0xB4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x44, 0x0F, 0x6F, 0xAC, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x44, 0x0F, 0x6F, 0xA4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x44, 0x0F, 0x6F, 0x9C, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x44, 0x0F, 0x6F, 0x94, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x44, 0x0F, 0x6F, 0x8C, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x44, 0x0F, 0x6F, 0x84, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0xBC, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0xB4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0xAC, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0xA4, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0x9C, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0x94, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0x8C, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0xF3, 0x0F, 0x6F, 0x84, 0x24, 0x00, 0x00, 0x00, 0x00, 0x48, 0x83, 0xC4, 0x10, 0x9D, 0x41, 0x5F, 0x41, 0x5E, 0x41, 0x5D, 0x41, 0x5C, 0x41, 0x5B, 0x41, 0x5A, 0x41, 0x59, 0x41, 0x58, 0x5F, 0x5E, 0x48, 0x83, 0xC4, 0x08, 0x5D, 0x5B, 0x5A, 0x59, 0x58 };

/*
add rsp, 8 // This extra add rsp instruction is here since the corresponding backup routine has an extra sub rsp instruction; used to ensure stack alignment.
popfq
pop r15
pop r14
pop r13
pop r12
pop r11
pop r10
pop r9
pop r8
pop rdi
pop rsi
add rsp, 8
pop rbp
pop rbx
pop rdx
pop rcx
pop rax
*/

// Omits XMM registers
constexpr std::array<std::uint8_t, 32> RESTORE_GENERAL_REGISTERS = { 0x48, 0x83, 0xC4, 0x08, 0x9D, 0x41, 0x5F, 0x41, 0x5E, 0x41, 0x5D, 0x41, 0x5C, 0x41, 0x5B, 0x41, 0x5A, 0x41, 0x59, 0x41, 0x58, 0x5F, 0x5E, 0x48, 0x83, 0xC4, 0x08, 0x5D, 0x5B, 0x5A, 0x59, 0x58 };
};
#if defined(_M_X64)
namespace arch = x64;
#elif defined(_M_IX86)
namespace arch = x86;
#endif
};
};
35 changes: 25 additions & 10 deletions cpp/err.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,31 @@
#pragma once
/*
MIT License

Copyright (c) 2020-2022 Basit Ayantunde

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

#pragma once
#include <iostream>
#include <format>

// Use custom Result/Option implementations if STX is not present.
#ifndef STX_VERSION
template<class E>
class Err {
private:
Expand Down Expand Up @@ -48,7 +69,6 @@ class Result {
constexpr Result(Err<E> error) : error_value(error.consume()), is_ok(false), inner() {};
constexpr Result(Ok<T>&& object) : inner(std::move(object.consume())), is_ok(true), error_value() {};


constexpr T unwrap() {
if (is_ok) {
return std::move(inner);
Expand Down Expand Up @@ -102,9 +122,4 @@ class Option {
return std::move(or_value);
}
}
};
#else
template <typename T, typename Error>
using Result = stx::Result<T, Error>;
using stx::Option, stx::None, stx::Some;
#endif
};
Loading