Skip to content

Switch to naked_asm macros #4

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
RinLovesYou wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Switch to naked_asm macros #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions proxygen-macros/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ pub fn forward(_attr_input: TokenStream, item: TokenStream) -> TokenStream {
pub unsafe extern "C" fn #func_name() {
#[cfg(target_arch = "x86_64")]
{
std::arch::asm!(
std::arch::naked_asm!(
"call {wait_dll_proxy_init}",
"mov rax, qword ptr [rip + {ORIG_FUNCS_PTR}]",
"add rax, {orig_index} * 8",
Expand All @@ -122,13 +122,12 @@ pub fn forward(_attr_input: TokenStream, item: TokenStream) -> TokenStream {
wait_dll_proxy_init = sym crate::wait_dll_proxy_init,
ORIG_FUNCS_PTR = sym crate::ORIG_FUNCS_PTR,
orig_index = const #orig_index_ident,
options(noreturn)
)
}

#[cfg(target_arch = "x86")]
{
std::arch::asm!(
std::arch::naked_asm!(
"call {wait_dll_proxy_init}",
"mov eax, dword ptr [{ORIG_FUNCS_PTR}]",
"add eax, {orig_index} * 4",
Expand All @@ -138,7 +137,6 @@ pub fn forward(_attr_input: TokenStream, item: TokenStream) -> TokenStream {
wait_dll_proxy_init = sym crate::wait_dll_proxy_init,
ORIG_FUNCS_PTR = sym crate::ORIG_FUNCS_PTR,
orig_index = const #orig_index_ident,
options(noreturn)
)
}
}
Expand Down