Skip to content

Comment out the .cfi_adjust_cfa_offset directives on x86 for now. #157

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

Merged
sunfishcode merged 1 commit into from
Mar 7, 2025
Merged

Comment out the .cfi_adjust_cfa_offset directives on x86 for now. #157

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
10 changes: 8 additions & 2 deletions src/arch/x86.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,21 @@ pub(super) fn trap() -> ! {
#[allow(dead_code)]
pub(super) fn dynamic_table_addr() -> *const linux_raw_sys::elf::Elf_Dyn {
let addr;
// We ought to add `.cfi_adjust_cfa_offset` directives here describe our
// modifications to the stack pointer value, however the Rust compiler
// sometimes omits `.cfi_start_proc`/`.cfi_end_proc`, and when it does
// this it prohibits use of `.cfi_adjust_cfa_offset`, and there doesn't
// appear to be any way for us to test when it does this. So just comment
// them out entirely for now.
unsafe {
asm!(
".weak _DYNAMIC",
".hidden _DYNAMIC",
"call 2f",
".cfi_adjust_cfa_offset 4",
//".cfi_adjust_cfa_offset 4",
"2:",
"pop {0}", // We depend on this being exactly one byte long.
".cfi_adjust_cfa_offset -4",
//".cfi_adjust_cfa_offset -4",
"add {0}, offset _GLOBAL_OFFSET_TABLE_+1",
"lea {0}, [{0} + _DYNAMIC@GOTOFF]",
out(reg) addr
Expand Down