Merge pull request #17 from roblabla/use-upstream-gimli

Use upstream gimli

Author: main--

Cargo.toml

@@ -8,6 +8,6 @@ debug = true
 members = ["unwind"]
 
 #[patch.crates-io]
-#gimli = { git = 'https://github.com/main--/gimli.git?branch=unwind-patches' }
+#gimli = { git = 'https://github.com/roblabla/gimli.git?branch=lookup_and_parse' }
 [replace]
-"gimli:0.14.0" = { git = 'https://github.com/main--/gimli.git', branch = 'unwind-patches' }
+"gimli:0.16.0" = { git = 'https://github.com/roblabla/gimli.git', branch = 'lookup_and_parse' }

unwind/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["main() <[email protected]>"]
 
 [dependencies]
-gimli = "0.14"
+gimli = "0.16"
 libc = "0.2"
 fallible-iterator = "0.1"
 log = "0.4"

unwind/examples/demo.rs

@@ -19,7 +19,7 @@ fn foo() {
 }
 
 fn main() {
-    env_logger::init().unwrap();
+    env_logger::init();
 
     foo();
     println!("down");

unwind/examples/trace.rs

@@ -20,7 +20,7 @@ fn foo() {
 }
 
 fn main() {
-    env_logger::init().unwrap();
+    env_logger::init();
 
     foo();
     println!("down");

unwind/src/lib.rs

@@ -115,47 +115,32 @@ impl ObjectRecord {
             ..
         } = self;
 
-        let fdeptr = eh_frame_hdr.table().unwrap().lookup(address, bases).unwrap();
-        let fdeptr = match fdeptr {
-            Pointer::Direct(x) => x,
-            _ => unreachable!(),
-        };
-
-        let entry = gimli::parse_cfi_entry(bases, *sel, &mut EndianBuf::new(unsafe { std::slice::from_raw_parts(fdeptr as *const u8, 0x1000000) }, NativeEndian)).unwrap().unwrap();
-        let target_fde = match entry {
-            CieOrFde::Fde(fde) => Some(fde.parse(|offset| sel.cie_from_offset(bases, offset))?),
-            CieOrFde::Cie(_) => unimplemented!(), // return error here probably
-        };
-
-
-        if let Some(fde) = target_fde {
-            trace!("fde {:x} - {:x}", fde.initial_address(), fde.len());
-            assert!(fde.contains(address));
-            let mut result_row = None;
-            let mut ctx = ctx.initialize(fde.cie()).unwrap();
-
-            {
-                let mut table = UnwindTable::new(&mut ctx, &fde);
-                while let Some(row) = table.next_row()? {
-                    if row.contains(address) {
-                        result_row = Some(row.clone());
-                        break;
-                    }
+        let fde = eh_frame_hdr.table().unwrap()
+            .lookup_and_parse(address, bases, sel.clone(), |offset| sel.cie_from_offset(bases, offset))?;
+
+        let mut result_row = None;
+        let mut ctx = ctx.initialize(fde.cie()).unwrap();
+
+        {
+            let mut table = UnwindTable::new(&mut ctx, &fde);
+            while let Some(row) = table.next_row()? {
+                if row.contains(address) {
+                    result_row = Some(row.clone());
+                    break;
                 }
             }
-
-            if let Some(row) = result_row {
-                return Ok(UnwindInfo {
-                    row,
-                    ctx: ctx.reset(),
-                    personality: fde.personality(),
-                    lsda: fde.lsda(),
-                    initial_address: fde.initial_address(),
-                });
-            }
         }
 
-        Err(gimli::Error::NoUnwindInfoForAddress)
+        match result_row {
+            Some(row) => Ok(UnwindInfo {
+                row,
+                ctx: ctx.reset(),
+                personality: fde.personality(),
+                lsda: fde.lsda(),
+                initial_address: fde.initial_address(),
+            }),
+            None => Err(gimli::Error::NoUnwindInfoForAddress)
+        }
     }
 }