Merge pull request #20 from philipc/update-gimli

Update gimli

Author: main--

Cargo.toml

@@ -6,8 +6,3 @@ debug = true
 
 [workspace]
 members = ["unwind"]
-
-#[patch.crates-io]
-#gimli = { git = 'https://github.com/roblabla/gimli.git?branch=lookup_and_parse' }
-[replace]
-"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.16"
+gimli = "0.16.1"
 libc = "0.2"
 fallible-iterator = "0.1"
 log = "0.4"

unwind/examples/trace.rs

@@ -7,7 +7,7 @@ use fallible_iterator::FallibleIterator;
 use unwind::{Unwinder, DwarfUnwinder};
 
 fn bar() {
-    DwarfUnwinder::default().trace(|mut x| {
+    DwarfUnwinder::default().trace(|x| {
         while let Some(frame) = x.next().unwrap() {
             backtrace::resolve(x.registers()[16].unwrap() as *mut std::os::raw::c_void, |sym| println!("{:?} ({:?}:{:?})", sym.name(), sym.filename(), sym.lineno()));
             println!("{:?}", frame);

unwind/src/find_cfi/baremetal.rs

@@ -18,7 +18,7 @@ pub fn find_cfi_sections() -> Vec<EhRef> {
         let text_end = &__text_end as *const _ as u64;
         let cfi_start = &__ehframehdr_start as *const _ as u64;
         let cfi_end = &__ehframehdr_end as *const _ as u64;
-        let eh_frame_end = &__ehframe_end as *const _ as u64;
+        let ehframe_end = &__ehframe_end as *const _ as u64;
 
         cfi.push(EhRef {
             obj_base: 0,

unwind/src/lib.rs

@@ -5,7 +5,7 @@ extern crate libc;
 extern crate fallible_iterator;
 #[macro_use] extern crate log;
 
-use gimli::{UnwindSection, UnwindTable, UnwindTableRow, EhFrame, BaseAddresses, UninitializedUnwindContext, Pointer, Reader, CieOrFde, EndianBuf, NativeEndian, CfaRule, RegisterRule, EhFrameHdr, ParsedEhFrameHdr};
+use gimli::{UnwindSection, UnwindTable, UnwindTableRow, EhFrame, BaseAddresses, UninitializedUnwindContext, Pointer, Reader, EndianSlice, NativeEndian, CfaRule, RegisterRule, EhFrameHdr, ParsedEhFrameHdr};
 use fallible_iterator::FallibleIterator;
 
 mod registers;
@@ -35,7 +35,7 @@ pub trait Unwinder: Default {
     fn trace<F>(&mut self, f: F) where F: FnMut(&mut StackFrames);
 }
 
-type StaticReader = EndianBuf<'static, NativeEndian>;
+type StaticReader = EndianSlice<'static, NativeEndian>;
 
 struct ObjectRecord {
     er: EhRef,

unwind/src/libunwind_shim.rs

@@ -114,7 +114,7 @@ pub unsafe extern "C" fn _Unwind_RaiseException(exception: *mut _Unwind_Exceptio
     unreachable!();
 }
 
-unsafe fn unwind_tracer(mut frames: &mut ::StackFrames, exception: *mut _Unwind_Exception) {
+unsafe fn unwind_tracer(frames: &mut ::StackFrames, exception: *mut _Unwind_Exception) {
     if let Some(contptr) = (*exception).private_contptr {
         loop {
             if let Some(frame) = frames.next().unwrap() {
@@ -156,7 +156,7 @@ unsafe fn unwind_tracer(mut frames: &mut ::StackFrames, exception: *mut _Unwind_
 pub unsafe extern "C" fn _Unwind_Backtrace(trace: _Unwind_Trace_Fn,
                                     trace_argument: *mut c_void)
                                            -> _Unwind_Reason_Code {
-    DwarfUnwinder::default().trace(|mut frames| {
+    DwarfUnwinder::default().trace(|frames| {
         while let Some(frame) = frames.next().unwrap() {
             let mut ctx = _Unwind_Context {
                 lsda: frame.lsda.unwrap_or(0),

unwind/tests/correctness.rs

@@ -28,7 +28,7 @@ fn test_frame_3() {
     }
     println!();
 
-    DwarfUnwinder::default().trace(move |mut frames| {
+    DwarfUnwinder::default().trace(move |frames| {
         // skip 2 (unwind-rs + test_frame_3)
         frames.next().unwrap();
         frames.next().unwrap();