add samples

Cargo.toml

@@ -11,7 +11,9 @@ edition = "2021"
 libc = { version = "0.2.140", default-features = false, features = ["extra_traits"] }
 
 [profile.dev]
-panic = "abort"
+# the test binary needs uwutables
+panic = "unwind"
 
 [profile.release]
-panic = "abort"
+# the test binary needs uwutables
+panic = "unwind"

src/dwarf/divination.rs

@@ -29,10 +29,8 @@ extern "C" {
 
 #[derive(Debug, Clone, Copy)]
 pub struct DwarfInfo {
-    /// The text segment
-    pub(super) map: *const [u8],
     /// PT_GNU_EH_FRAME
-    pub(super) dwarf: *const u8,
+    pub(crate) eh_frame: *const u8,
 }
 
 pub fn dwarf_info(addr: *const ffi::c_void) -> Option<DwarfInfo> {
@@ -62,8 +60,7 @@ pub fn dwarf_info(addr: *const ffi::c_void) -> Option<DwarfInfo> {
         }
 
         Some(DwarfInfo {
-            map: core::ptr::slice_from_raw_parts(out.dlfo_map_start as _, text_len),
+            eh_frame: out.dlfo_eh_frame as _,
-            dwarf: out.dlfo_eh_frame as _,
         })
     }
 }

src/dwarf/mod.rs

@@ -8,9 +8,9 @@ mod parse;
 
 pub use divination::{dwarf_info, DwarfInfo};
 
-pub fn uwutables(dwarf_info: DwarfInfo) {
+pub unsafe fn uwutables(eh_frame: *const u8) {
-    trace!("getting uwutables from {:p}", dwarf_info.dwarf);
+    trace!("getting uwutables from {:p}", eh_frame);
     unsafe {
-        parse::parse_cie(dwarf_info.dwarf);
+        parse::parse_cie(eh_frame);
     }
 }

src/lib.rs

@@ -10,7 +10,7 @@ mod stdext;
 pub mod uw;
 
 mod arch;
-mod dwarf;
+pub mod dwarf;
 mod identify;
 
 mod walk;
@@ -21,8 +21,7 @@ pub unsafe extern "C" fn _UnwindRaiseException(
 ) -> uw::_Unwind_Reason_Code {
     trace!("someone raised an exception with addr {exception_object:p}");
     let di = crate::dwarf::dwarf_info(arch::get_rip() as _).unwrap();
-    crate::dwarf::uwutables(di);
+    crate::dwarf::uwutables(di.eh_frame);
-    // walk::fp::walk();
 
     stdext::abort();
 }

src/main.rs

@@ -1,12 +1,19 @@
 use uwuwind::uw;
 
 #[repr(C)]
+#[allow(dead_code)]
 struct Exception {
     _uwe: uw::_Unwind_Exception,
     uwu: &'static str,
 }
 
 fn main() {
+    let eh_frame = std::fs::read("eh_frame.bin").expect("could not find ./eh_frame.bin");
+    unsafe {
+        uwuwind::dwarf::uwutables(eh_frame.as_ptr());
+    }
+    return;
+    /*
     unsafe {
         uwuwind::set_personality_routine(personality_routine);
 
@@ -22,8 +29,10 @@ fn main() {
 
         uwuwind::_UnwindRaiseException(exception.cast::<uw::_Unwind_Exception>());
     }
+    */
 }
 
+#[allow(dead_code)]
 fn personality_routine(
     _version: i32,
     _actions: uw::_UnwindAction,