undind

Author: mkroening

compiler/rustc_target/src/spec/base/hermit.rs

@@ -9,7 +9,7 @@ pub(crate) fn opts() -> TargetOptions {
         position_independent_executables: true,
         static_position_independent_executables: true,
         has_thread_local: true,
-        panic_strategy: PanicStrategy::Abort,
+        panic_strategy: PanicStrategy::Unwind,
         ..Default::default()
     }
 }

compiler/rustc_target/src/spec/targets/x86_64_unknown_hermit.rs

@@ -1,4 +1,4 @@
-use crate::spec::{StackProbeType, Target, TargetOptions, base};
+use crate::spec::{Target, TargetOptions, base};
 
 pub(crate) fn target() -> Target {
     Target {
@@ -18,7 +18,6 @@ pub(crate) fn target() -> Target {
             features: "+rdrnd,+rdseed".into(),
             plt_by_default: false,
             max_atomic_width: Some(64),
-            stack_probes: StackProbeType::Inline,
             ..base::hermit::opts()
         },
     }

library/panic_unwind/src/hermit.rs

@@ -34,9 +34,6 @@ cfg_if::cfg_if! {
     if #[cfg(target_os = "emscripten")] {
         #[path = "emcc.rs"]
         mod imp;
-    } else if #[cfg(target_os = "hermit")] {
-        #[path = "hermit.rs"]
-        mod imp;
     } else if #[cfg(target_os = "l4re")] {
         // L4Re is unix family but does not yet support unwinding.
         #[path = "dummy.rs"]
@@ -45,6 +42,7 @@ cfg_if::cfg_if! {
         all(target_family = "windows", target_env = "gnu"),
         target_os = "psp",
         target_os = "xous",
+        target_os = "hermit",
         target_os = "solid_asp3",
         all(target_family = "unix", not(any(target_os = "espidf", target_os = "rtems", target_os = "nuttx"))),
         all(target_vendor = "fortanix", target_env = "sgx"),

library/panic_unwind/src/lib.rs

@@ -73,13 +73,40 @@ pub unsafe fn init(argc: isize, argv: *const *const u8, _sigpipe: u8) {
 // NOTE: this is not guaranteed to run, for example when the program aborts.
 pub unsafe fn cleanup() {}
 
+mod eh_unwinding {
+    pub(crate) struct EhFrameFinder;
+    // pub(crate) static mut EH_FRAME_ADDRESS: usize = 0;
+    extern "C" {
+        static mut EH_FRAME_ADDRESS: usize;
+    }
+    pub(crate) static EH_FRAME_SETTINGS: EhFrameFinder = EhFrameFinder;
+
+    unsafe impl unwind::EhFrameFinder for EhFrameFinder {
+        fn find(&self, _pc: usize) -> Option<unwind::FrameInfo> {
+            if unsafe { EH_FRAME_ADDRESS == 0 } {
+                None
+            } else {
+                Some(unwind::FrameInfo {
+                    text_base: None,
+                    kind: unwind::FrameInfoKind::EhFrame(unsafe { EH_FRAME_ADDRESS }),
+                })
+            }
+        }
+    }
+}
+
 #[cfg(not(test))]
 #[no_mangle]
 pub unsafe extern "C" fn runtime_entry(
     argc: i32,
     argv: *const *const c_char,
     env: *const *const c_char,
 ) -> ! {
+    {
+        // unsafe { eh_unwinding::EH_FRAME_ADDRESS = 0x1200000 + 0x4c008 };
+        unwind::set_custom_eh_frame_finder(&eh_unwinding::EH_FRAME_SETTINGS).ok();
+    }
+
     extern "C" {
         fn main(argc: isize, argv: *const *const c_char) -> i32;
     }

library/std/src/sys/pal/hermit/mod.rs

@@ -29,6 +29,7 @@ cfg_if::cfg_if! {
     } else if #[cfg(any(
         all(target_family = "windows", target_env = "gnu"),
         target_os = "psp",
+        target_os = "hermit",
         target_os = "xous",
         target_os = "solid_asp3",
         all(target_family = "unix", not(target_os = "espidf"), not(target_os = "l4re"), not(target_os = "rtems"), not(target_os = "nuttx")),
@@ -40,7 +41,6 @@ cfg_if::cfg_if! {
         // - os=none ("bare metal" targets)
         // - os=uefi
         // - os=espidf
-        // - os=hermit
         // - nvptx64-nvidia-cuda
         // - arch=avr
     }

library/std/src/sys/personality/mod.rs

@@ -21,7 +21,7 @@ cfg-if = "1.0"
 [target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]
 libc = { version = "0.2.140", features = ['rustc-dep-of-std'], default-features = false }
 
-[target.'cfg(target_os = "xous")'.dependencies]
+[target.'cfg(any(target_os = "hermit", target_os = "xous"))'.dependencies]
 unwinding = { version = "0.2.3", features = ['rustc-dep-of-std', 'unwinder', 'fde-custom'], default-features = false }
 
 [features]

library/unwind/Cargo.toml

@@ -33,7 +33,10 @@ cfg_if::cfg_if! {
     ))] {
         mod libunwind;
         pub use libunwind::*;
-    } else if #[cfg(target_os = "xous")] {
+    } else if #[cfg(any(
+        target_os = "hermit",
+        target_os = "xous",
+    ))] {
         mod unwinding;
         pub use unwinding::*;
     } else if #[cfg(target_family = "wasm")] {
@@ -42,7 +45,6 @@ cfg_if::cfg_if! {
     } else {
         // no unwinder on the system!
         // - os=none ("bare metal" targets)
-        // - os=hermit
         // - os=uefi
         // - os=cuda
         // - nvptx64-nvidia-cuda

library/unwind/src/lib.rs

@@ -105,7 +105,7 @@ pub type _Unwind_Exception_Cleanup_Fn =
     any(
         all(
             feature = "llvm-libunwind",
-            any(target_os = "fuchsia", target_os = "linux", target_os = "xous")
+            any(target_os = "fuchsia", target_os = "linux", target_os = "hermit", target_os = "xous")
         ),
         all(target_os = "windows", target_env = "gnu", target_abi = "llvm")
     ),
@@ -140,7 +140,7 @@ if #[cfg(any(target_vendor = "apple", target_os = "netbsd", not(target_arch = "a
     pub use _Unwind_Action::*;
 
     #[cfg_attr(
-        all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux", target_os = "xous")),
+        all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux", target_os = "hermit", target_os = "xous")),
         link(name = "unwind", kind = "static", modifiers = "-bundle")
     )]
     extern "C" {
@@ -198,7 +198,7 @@ if #[cfg(any(target_vendor = "apple", target_os = "netbsd", not(target_arch = "a
     pub const UNWIND_IP_REG: c_int = 15;
 
     #[cfg_attr(
-        all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux", target_os = "xous")),
+        all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux", target_os = "hermit", target_os = "xous")),
         link(name = "unwind", kind = "static", modifiers = "-bundle")
     )]
     extern "C" {
@@ -271,14 +271,14 @@ if #[cfg(all(target_vendor = "apple", not(target_os = "watchos"), target_arch =
     pub use _Unwind_SjLj_RaiseException as _Unwind_RaiseException;
 } else {
     #[cfg_attr(
-        all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux", target_os = "xous")),
+        all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux", target_os = "hermit", target_os = "xous")),
         link(name = "unwind", kind = "static", modifiers = "-bundle")
     )]
     extern "C-unwind" {
         pub fn _Unwind_RaiseException(exception: *mut _Unwind_Exception) -> _Unwind_Reason_Code;
     }
     #[cfg_attr(
-        all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux", target_os = "xous")),
+        all(feature = "llvm-libunwind", any(target_os = "fuchsia", target_os = "linux", target_os = "hermit", target_os = "xous")),
         link(name = "unwind", kind = "static", modifiers = "-bundle")
     )]
     extern "C" {