-
Notifications
You must be signed in to change notification settings - Fork 262
Add AIX support in gimli symbolizer #508
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| use super::mystd::borrow::ToOwned; | ||
| use super::mystd::env; | ||
| use super::mystd::ffi::{CStr, OsStr}; | ||
| use super::mystd::io::Error; | ||
| use super::mystd::os::unix::prelude::*; | ||
| use super::xcoff; | ||
| use super::{Library, LibrarySegment, Vec}; | ||
| use alloc::vec; | ||
| use core::mem; | ||
|
|
||
| const EXE_IMAGE_BASE: u64 = 0x100000000; | ||
|
|
||
| /// On AIX, we use `loadquery` with `L_GETINFO` flag to query libraries mmapped. | ||
| /// See https://www.ibm.com/docs/en/aix/7.2?topic=l-loadquery-subroutine for | ||
| /// detailed information of `loadquery`. | ||
| pub(super) fn native_libraries() -> Vec<Library> { | ||
| let mut ret = Vec::new(); | ||
| unsafe { | ||
| let mut buffer = vec![mem::zeroed::<libc::ld_info>(); 64]; | ||
| loop { | ||
| if libc::loadquery( | ||
| libc::L_GETINFO, | ||
| buffer.as_mut_ptr() as *mut libc::c_char, | ||
| (mem::size_of::<libc::ld_info>() * buffer.len()) as u32, | ||
| ) != -1 | ||
| { | ||
| break; | ||
| } else { | ||
| match Error::last_os_error().raw_os_error() { | ||
| Some(libc::ENOMEM) => { | ||
| buffer.resize(buffer.len() * 2, mem::zeroed::<libc::ld_info>()); | ||
| } | ||
| Some(_) => { | ||
| // If other error occurs, return empty libraries. | ||
| return Vec::new(); | ||
| } | ||
| _ => unreachable!(), | ||
| } | ||
| } | ||
| } | ||
| let mut current = buffer.as_mut_ptr(); | ||
| loop { | ||
| let text_base = (*current).ldinfo_textorg as usize; | ||
| let filename_ptr: *const libc::c_char = &(*current).ldinfo_filename[0]; | ||
| let bytes = CStr::from_ptr(filename_ptr).to_bytes(); | ||
| let member_name_ptr = filename_ptr.offset((bytes.len() + 1) as isize); | ||
| let mut filename = OsStr::from_bytes(bytes).to_owned(); | ||
| if text_base == EXE_IMAGE_BASE as usize { | ||
| if let Ok(exe) = env::current_exe() { | ||
| filename = exe.into_os_string(); | ||
| } | ||
| } | ||
| let bytes = CStr::from_ptr(member_name_ptr).to_bytes(); | ||
bzEq marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| let member_name = OsStr::from_bytes(bytes).to_owned(); | ||
| if let Some(image) = xcoff::parse_image(filename.as_ref(), &member_name) { | ||
| ret.push(Library { | ||
| name: filename, | ||
| member_name, | ||
| segments: vec![LibrarySegment { | ||
| stated_virtual_memory_address: image.base as usize, | ||
| len: image.size, | ||
| }], | ||
| bias: (text_base + image.offset).wrapping_sub(image.base as usize), | ||
| }); | ||
| } | ||
| if (*current).ldinfo_next == 0 { | ||
| break; | ||
| } | ||
| current = (current as *mut libc::c_char).offset((*current).ldinfo_next as isize) | ||
| as *mut libc::ld_info; | ||
| } | ||
| } | ||
| return ret; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,186 @@ | ||
| use super::mystd::ffi::{OsStr, OsString}; | ||
| use super::mystd::os::unix::ffi::OsStrExt; | ||
| use super::mystd::str; | ||
| use super::{gimli, Context, Endian, EndianSlice, Mapping, Path, Stash, Vec}; | ||
| use alloc::sync::Arc; | ||
| use core::ops::Deref; | ||
| use object::read::archive::ArchiveFile; | ||
| use object::read::xcoff::{FileHeader, SectionHeader, XcoffFile, XcoffSymbol}; | ||
| use object::Object as _; | ||
| use object::ObjectSection as _; | ||
| use object::ObjectSymbol as _; | ||
| use object::SymbolFlags; | ||
|
|
||
| #[cfg(target_pointer_width = "32")] | ||
| type Xcoff = object::xcoff::FileHeader32; | ||
| #[cfg(target_pointer_width = "64")] | ||
| type Xcoff = object::xcoff::FileHeader64; | ||
|
|
||
| impl Mapping { | ||
| pub fn new(path: &Path, member_name: &OsString) -> Option<Mapping> { | ||
| let map = super::mmap(path)?; | ||
| Mapping::mk(map, |data, stash| { | ||
| if member_name.is_empty() { | ||
| Context::new(stash, Object::parse(data)?, None, None) | ||
| } else { | ||
| let archive = ArchiveFile::parse(data).ok()?; | ||
| for member in archive | ||
| .members() | ||
| .filter_map(|m| m.ok()) | ||
| .filter(|m| OsStr::from_bytes(m.name()) == member_name) | ||
| { | ||
| let member_data = member.data(data).ok()?; | ||
| if let Some(obj) = Object::parse(member_data) { | ||
| return Context::new(stash, obj, None, None); | ||
| } | ||
| } | ||
| None | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| struct ParsedSym<'a> { | ||
| address: u64, | ||
| size: u64, | ||
| name: &'a str, | ||
| } | ||
|
|
||
| pub struct Object<'a> { | ||
| syms: Vec<ParsedSym<'a>>, | ||
| file: XcoffFile<'a, Xcoff>, | ||
| } | ||
|
|
||
| pub struct Image { | ||
| pub offset: usize, | ||
| pub base: u64, | ||
| pub size: usize, | ||
| } | ||
|
|
||
| pub fn parse_xcoff(data: &[u8]) -> Option<Image> { | ||
| let mut offset = 0; | ||
| let header = Xcoff::parse(data, &mut offset).ok()?; | ||
| let _ = header.aux_header(data, &mut offset).ok()?; | ||
| let sections = header.sections(data, &mut offset).ok()?; | ||
| if let Some(section) = sections.iter().find(|s| { | ||
| if let Ok(name) = str::from_utf8(&s.s_name()[0..5]) { | ||
| name == ".text" | ||
| } else { | ||
| false | ||
| } | ||
| }) { | ||
| Some(Image { | ||
| offset: section.s_scnptr() as usize, | ||
| base: section.s_paddr() as u64, | ||
| size: section.s_size() as usize, | ||
| }) | ||
| } else { | ||
| None | ||
| } | ||
| } | ||
|
|
||
| pub fn parse_image(path: &Path, member_name: &OsString) -> Option<Image> { | ||
| let map = super::mmap(path)?; | ||
| let data = map.deref(); | ||
| if member_name.is_empty() { | ||
| return parse_xcoff(data); | ||
| } else { | ||
| let archive = ArchiveFile::parse(data).ok()?; | ||
| for member in archive | ||
| .members() | ||
| .filter_map(|m| m.ok()) | ||
| .filter(|m| OsStr::from_bytes(m.name()) == member_name) | ||
| { | ||
| let member_data = member.data(data).ok()?; | ||
| if let Some(image) = parse_xcoff(member_data) { | ||
| return Some(image); | ||
| } | ||
| } | ||
| None | ||
| } | ||
| } | ||
|
|
||
| impl<'a> Object<'a> { | ||
| fn get_concrete_size(file: &XcoffFile<'a, Xcoff>, sym: &XcoffSymbol<'a, '_, Xcoff>) -> u64 { | ||
| match sym.flags() { | ||
| SymbolFlags::Xcoff { | ||
| n_sclass: _, | ||
| x_smtyp: _, | ||
| x_smclas: _, | ||
| containing_csect: Some(index), | ||
| } => { | ||
| if let Ok(tgt_sym) = file.symbol_by_index(index) { | ||
| Self::get_concrete_size(file, &tgt_sym) | ||
| } else { | ||
| 0 | ||
| } | ||
| } | ||
| _ => sym.size(), | ||
| } | ||
| } | ||
|
|
||
| fn parse(data: &'a [u8]) -> Option<Object<'a>> { | ||
| let file = XcoffFile::parse(data).ok()?; | ||
| let mut syms = file | ||
| .symbols() | ||
| .filter_map(|sym| { | ||
| let name = sym.name().map_or("", |v| v); | ||
| let address = sym.address(); | ||
| let size = Self::get_concrete_size(&file, &sym); | ||
| if name == ".text" || name == ".data" { | ||
| // We don't want to include ".text" and ".data" symbols. | ||
| // If they are included, since their ranges cover other | ||
| // symbols, when searching a symbol for a given address, | ||
| // ".text" or ".data" is returned. That's not what we expect. | ||
| None | ||
| } else { | ||
| Some(ParsedSym { | ||
| address, | ||
| size, | ||
| name, | ||
| }) | ||
| } | ||
| }) | ||
| .collect::<Vec<_>>(); | ||
| syms.sort_by_key(|s| s.address); | ||
| Some(Object { syms, file }) | ||
| } | ||
|
|
||
| pub fn section(&self, _: &Stash, name: &str) -> Option<&'a [u8]> { | ||
| Some(self.file.section_by_name(name)?.data().ok()?) | ||
| } | ||
|
|
||
| pub fn search_symtab<'b>(&'b self, addr: u64) -> Option<&'b [u8]> { | ||
| // Symbols, except ".text" and ".data", are sorted and are not overlapped each other, | ||
| // so we can just perform a binary search here. | ||
| let i = match self.syms.binary_search_by_key(&addr, |sym| sym.address) { | ||
| Ok(i) => i, | ||
| Err(i) => i.checked_sub(1)?, | ||
| }; | ||
| let sym = self.syms.get(i)?; | ||
| if (sym.address..sym.address + sym.size).contains(&addr) { | ||
| // On AIX, for a function call, for example, `foo()`, we have | ||
| // two symbols `foo` and `.foo`. `foo` references the function | ||
| // descriptor and `.foo` references the function entry. | ||
| // See https://www.ibm.com/docs/en/xl-fortran-aix/16.1.0?topic=calls-linkage-convention-function | ||
| // for more information. | ||
| // We trim the prefix `.` here, so that the rust demangler can work | ||
| // properly. | ||
| Some(sym.name.trim_start_matches(".").as_bytes()) | ||
| } else { | ||
| None | ||
| } | ||
| } | ||
|
|
||
| pub(super) fn search_object_map(&self, _addr: u64) -> Option<(&Context<'_>, u64)> { | ||
| None | ||
| } | ||
| } | ||
|
|
||
| pub(super) fn handle_split_dwarf<'data>( | ||
| _package: Option<&gimli::DwarfPackage<EndianSlice<'data, Endian>>>, | ||
| _stash: &'data Stash, | ||
| _load: addr2line::SplitDwarfLoad<EndianSlice<'data, Endian>>, | ||
| ) -> Option<Arc<gimli::Dwarf<EndianSlice<'data, Endian>>>> { | ||
| None | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.