Enhance implementation

Author: Kai Luo

src/symbolize/gimli/libs_aix.rs

@@ -6,10 +6,21 @@ use super::{Library, LibrarySegment, Vec};
 pub(super) fn native_libraries() -> Vec<Library> {
     let mut ret = Vec::new();
     unsafe {
-        const BUFFER_SIZE: usize = 4 << 20;
-        let mut buffer = vec![0i8; BUFFER_SIZE];
-        if libc::loadquery(libc::L_GETINFO, buffer.as_mut_ptr(), BUFFER_SIZE as u32) < 0 {
-            panic!("loadquery failed");
+        let mut buffer = vec![std::mem::zeroed::<libc::ld_info>(); 64];
+        loop {
+            if libc::loadquery(
+                libc::L_GETINFO,
+                buffer.as_mut_ptr() as *mut i8,
+                (std::mem::size_of::<libc::ld_info>() * buffer.len()) as u32,
+            ) >= 0
+            {
+                break;
+            } else {
+                if std::io::Error::last_os_error().raw_os_error().unwrap() != libc::ENOMEM {
+                    return Vec::new();
+                }
+                buffer.resize(buffer.len() * 2, std::mem::zeroed::<libc::ld_info>());
+            }
         }
         let mut current = buffer.as_ptr() as *mut libc::ld_info;
         loop {
@@ -30,7 +41,8 @@ pub(super) fn native_libraries() -> Vec<Library> {
             if (*current).ldinfo_next == 0 {
                 break;
             }
-            current = ((current as i64) + ((*current).ldinfo_next) as i64) as *mut libc::ld_info;
+            current =
+                (current as *mut i8).offset((*current).ldinfo_next as isize) as *mut libc::ld_info;
         }
     }
     return ret;

src/symbolize/gimli/xcoff.rs

@@ -1,9 +1,14 @@
 use super::{Context, Mapping, Path, Stash, Vec};
-use object::read::xcoff::XcoffFile64;
+use object::read::xcoff::{FileHeader, SectionHeader, SectionTable, XcoffFile};
 use object::Object as _;
 use object::ObjectSection as _;
 use object::ObjectSymbol as _;
 
+#[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) -> Option<Mapping> {
         let map = super::mmap(path)?;
@@ -21,12 +26,12 @@ struct ParsedSym<'a> {
 
 pub struct Object<'a> {
     syms: Vec<ParsedSym<'a>>,
-    file: XcoffFile64<'a>,
+    file: XcoffFile<'a, Xcoff>,
 }
 
 impl<'a> Object<'a> {
     fn parse(data: &'a [u8]) -> Option<Object<'a>> {
-        let file = XcoffFile64::parse(data).ok()?;
+        let file = XcoffFile::parse(data).ok()?;
         let mut syms = file
             .symbols()
             .map(|sym| {