WIP

Author: roblabla

unwind/Cargo.toml

@@ -1,20 +1,22 @@
 [package]
-name = "unwind"
+name = "runwind"
 version = "0.1.0"
 authors = ["main() <[email protected]>"]
 
 [dependencies]
-gimli = { git = 'https://github.com/main--/gimli.git', branch = 'unwind-patches' }
-libc = "0.2"
-fallible-iterator = "0.1"
-log = "0.3"
+gimli = { path = '../../gimli', default-features = false }
+libc = { git = "https://github.com/megatonhammer/libc", default-features = false }
+fallible-iterator = { version = "0.1", default-features = false }
+log = { version = "0.3", default-features = false }
 
-[build-dependencies]
-gcc = "0.3.52"
+#[build-dependencies]
+#gcc = "0.3.52"
 
-[dev-dependencies]
-backtrace = "0.3"
-env_logger = "0.4"
+#[dev-dependencies]
+#backtrace = "0.3"
+#env_logger = "0.4"
 
 [features]
-nightly = []
+default = ["std"]
+std = ["gimli/std", "fallible-iterator/std", "libc/use_std"]
+nightly = ["gimli/alloc", "fallible-iterator/alloc"]

unwind/Cargo.toml.orig

@@ -1,14 +1,15 @@
-extern crate gcc;
+//extern crate gcc;
+
 use std::env;
 
 fn main() {
     match env::var("CARGO_FEATURE_NIGHTLY") {
-        Err(env::VarError::NotPresent) => (),
+        Err(env::VarError::NotPresent) => panic!("Meh"),
         _ => return
     }
 
-    gcc::Build::new()
-        .file(format!("src/glue/{}_helper.S", env::var("CARGO_CFG_TARGET_ARCH").expect("Didn't run with cargo")))
-        .include("src/glue")
-        .compile("unwind_helper");
+    //gcc::Build::new()
+    //    .file(format!("src/glue/{}_helper.S", env::var("CARGO_CFG_TARGET_ARCH").expect("Didn't run with cargo")))
+    //    .include("src/glue")
+    //    .compile("unwind_helper");
 }

unwind/build.rs

@@ -1,6 +1,8 @@
 use range::AddrRange;
 use super::EhRef;
 
+use alloc::Vec;
+
 extern "C" {
     static __text_start: usize;
     static __text_end: usize;

unwind/src/find_cfi/baremetal.rs

@@ -1,3 +1,6 @@
+#[cfg(not(feature = "std"))]
+compiler_error!("LD backend requires std");
+
 use libc::{c_void, c_int, c_char};
 use std::ffi::CStr;
 use std::{slice, mem};

unwind/src/find_cfi/ld.rs

@@ -1,4 +1,8 @@
-#![cfg_attr(feature = "nightly", feature(global_asm))]
+#![no_std]
+#![cfg_attr(feature = "nightly", feature(global_asm, alloc))]
+
+#![cfg(all(not(feature = "std"), not(feature = "nightly")))]
+compiler_error!("One of std or nightly feature needs to be enabled");
 
 extern crate gimli;
 extern crate libc;
@@ -15,7 +19,18 @@ pub mod libunwind_shim;
 pub mod glue;
 use registers::{Registers, DwarfRegister};
 use find_cfi::EhRef;
-
+//#[cfg(feature = "std")]
+//extern crate std;
+#[cfg(not(feature = "std"))]
+use core as std;
+
+//#[cfg(feature = "std")]
+//mod alloc {
+//    pub use std::*;
+//    pub use std::prelude::v1::*;
+//}
+#[cfg(not(feature = "std"))]
+extern crate alloc;
 
 pub struct StackFrames<'a> {
     unwinder: &'a mut DwarfUnwinder,
@@ -57,7 +72,7 @@ impl Default for DwarfUnwinder {
 
                 let eh_frame_hdr: &'static [u8] = std::slice::from_raw_parts(er.cfi.start as *const u8, er.cfi.len() as usize);
 
-                let eh_frame_hdr = EhFrameHdr::new(eh_frame_hdr, NativeEndian).parse(&bases, 8).unwrap();
+                let eh_frame_hdr = EhFrameHdr::new(eh_frame_hdr, NativeEndian).parse(&bases, std::mem::size_of::<*mut ()>() as u8).unwrap();
 
                 let cfi_addr = deref_ptr(eh_frame_hdr.eh_frame_ptr());
                 let cfi_sz = 0x10000000; // FIXME HACK
@@ -95,7 +110,6 @@ impl Unwinder for DwarfUnwinder {
     }
 }
 
-
 struct UnwindInfo<R: Reader> {
     row: UnwindTableRow<R>,
     personality: Option<Pointer>,
@@ -129,7 +143,7 @@ impl ObjectRecord {
 
 
         if let Some(fde) = target_fde {
-            trace!("fde {:x} - {:x}", fde.initial_address(), fde.len());
+            trace!("fde {:x} - {:x}, {:x}", fde.initial_address(), fde.len(), address);
             if !fde.contains(address) {
                 return Err(gimli::Error::NoUnwindInfoForAddress);
             }

unwind/src/lib.rs

@@ -118,6 +118,7 @@ unsafe fn unwind_tracer(mut frames: &mut ::StackFrames, exception: *mut _Unwind_
     if let Some(contptr) = (*exception).private_contptr {
         loop {
             if let Some(frame) = frames.next().unwrap() {
+                trace!("SP = {:x?}", frames.registers()[DwarfRegister::SP]);
                 if frames.registers()[DwarfRegister::SP].unwrap() == contptr {
                     break;
                 }
@@ -139,6 +140,7 @@ unsafe fn unwind_tracer(mut frames: &mut ::StackFrames, exception: *mut _Unwind_
                 registers: frames.registers(),
             };
 
+            trace!("contptr = {:x?}", frames.registers()[DwarfRegister::SP]);
             (*exception).private_contptr = frames.registers()[DwarfRegister::SP];
 
             // ABI specifies that phase 1 is optional, so we just run phase 2 (CLEANUP_PHASE)