Correct avma -> svma conversion

Author: Kai Luo

src/symbolize/gimli/libs_aix.rs

@@ -1,8 +1,11 @@
 use super::mystd::borrow::ToOwned;
 use super::mystd::ffi::{CStr, OsStr};
 use super::mystd::os::unix::prelude::*;
+use super::{mmap, xcoff};
 use super::{Library, LibrarySegment, Vec};
 
+const EXE_IMAGE_BASE: u64 = 0x100000000;
+
 pub(super) fn native_libraries() -> Vec<Library> {
     let mut ret = Vec::new();
     unsafe {
@@ -26,17 +29,25 @@ pub(super) fn native_libraries() -> Vec<Library> {
         loop {
             let text_base = (*current).ldinfo_textorg as usize;
             if text_base != 0 {
-                let text_size = (*current).ldinfo_textsize as usize;
                 let bytes = CStr::from_ptr(&(*current).ldinfo_filename[0]).to_bytes();
-                let name = OsStr::from_bytes(bytes).to_owned();
-                ret.push(Library {
-                    name,
-                    segments: vec![LibrarySegment {
-                        stated_virtual_memory_address: text_base,
-                        len: text_size,
-                    }],
-                    bias: 0,
-                });
+                let mut name = OsStr::from_bytes(bytes).to_owned();
+                if text_base == EXE_IMAGE_BASE as usize {
+                    if let Ok(exe) = std::env::current_exe() {
+                        name = exe.into_os_string();
+                    }
+                }
+                if let Some(map) = mmap(name.as_ref()) {
+                    if let Some(image) = xcoff::get_text_image(&map) {
+                        ret.push(Library {
+                            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;

src/symbolize/gimli/xcoff.rs

@@ -1,5 +1,7 @@
 use super::{Context, Mapping, Path, Stash, Vec};
-use object::read::xcoff::{FileHeader, SectionHeader, SectionTable, XcoffFile};
+use object::read::xcoff::FileHeader;
+use object::read::xcoff::SectionHeader;
+use object::read::xcoff::XcoffFile;
 use object::Object as _;
 use object::ObjectSection as _;
 use object::ObjectSymbol as _;
@@ -29,6 +31,30 @@ pub struct Object<'a> {
     file: XcoffFile<'a, Xcoff>,
 }
 
+pub struct Image {
+    pub offset: usize,
+    pub base: u64,
+    pub size: usize,
+}
+
+pub fn get_text_image(data: &[u8]) -> Option<Image> {
+    let mut offset = 0;
+    let header = Xcoff::parse(data, &mut offset).ok()?;
+    let aux_header = header.aux_header(data, &mut offset).ok()?;
+    let sections = header.sections(data, &mut offset).ok()?;
+    if let Some(section) = sections.iter().find(|s| {
+        let name = std::str::from_utf8(&s.s_name()[0..5]).unwrap();
+        return name == ".text";
+    }) {
+        return Some(Image {
+            offset: section.s_scnptr() as usize,
+            base: section.s_paddr() as u64,
+            size: section.s_size() as usize,
+        });
+    }
+    return None;
+}
+
 impl<'a> Object<'a> {
     fn parse(data: &'a [u8]) -> Option<Object<'a>> {
         let file = XcoffFile::parse(data).ok()?;