Improve support for program reset

Cargo.toml

@@ -71,8 +71,6 @@ members = [
     "crates/experimental/sel4-microkit/simple-ipc",
     "crates/experimental/sel4-musl",
     "crates/experimental/sel4-newlib",
-    "crates/experimental/sel4-reset",
-    "crates/experimental/sel4-reset/cli",
     "crates/experimental/sel4-shared-ring-buffer",
     "crates/experimental/sel4-shared-ring-buffer/block-io",
     "crates/experimental/sel4-shared-ring-buffer/block-io/types",
@@ -114,6 +112,7 @@ members = [
     "crates/private/tests/root-task/loader",
     "crates/private/tests/root-task/musl",
     "crates/private/tests/root-task/panicking",
+    "crates/private/tests/root-task/reset",
     "crates/private/tests/root-task/ring-test-harness",
     "crates/private/tests/root-task/tls",
     "crates/private/tests/root-task/verus/core",
@@ -146,6 +145,10 @@ members = [
     "crates/sel4-panicking/env",
     "crates/sel4-platform-info",
     "crates/sel4-platform-info/types",
+    "crates/sel4-reset",
+    "crates/sel4-reset/cli",
+    "crates/sel4-reset/tests",
+    "crates/sel4-rodata-static",
     "crates/sel4-root-task",
     "crates/sel4-root-task/macros",
     "crates/sel4-runtime-common",

crates/examples/root-task/spawn-thread/src/main.rs

@@ -19,7 +19,7 @@ use core::ptr;
 
 use cfg_if::cfg_if;
 
-use sel4_elf_header::{ElfHeader, PT_TLS};
+use sel4_elf_header::{PT_TLS, locate_phdrs};
 use sel4_initialize_tls::{TlsImage, UncheckedTlsImage};
 use sel4_root_task::{
     Never, abort, panicking::catch_unwind, root_task, set_global_allocator_mutex_notification,
@@ -215,14 +215,11 @@ impl SecondaryThreadFn {
 // // //
 
 fn get_tls_image() -> TlsImage {
-    unsafe extern "C" {
-        static __ehdr_start: ElfHeader;
-    }
-    let phdrs = unsafe {
-        assert!(__ehdr_start.is_magic_valid());
-        __ehdr_start.locate_phdrs()
-    };
-    let phdr = phdrs.iter().find(|phdr| phdr.p_type == PT_TLS).unwrap();
+    let phdr = locate_phdrs()
+        .unwrap_or_else(|err| abort!("{err}"))
+        .iter()
+        .find(|phdr| phdr.p_type == PT_TLS)
+        .unwrap_or_else(|| abort!("missing PT_TLS program header"));
     let unchecked = UncheckedTlsImage {
         vaddr: phdr.p_vaddr,
         filesz: phdr.p_filesz,