wiop

Author: nuta

kernel/src/loader.rs

@@ -23,6 +23,10 @@ const START_INFO: &StartInfo = &StartInfo {
     sys_print: |bytes| {
         println!("{}", core::str::from_utf8(bytes).unwrap());
     },
+    sys_panic: || {
+        error!("server panicked");
+        crate::scheduler::return_to_user();
+    },
 };
 
 fn load_elf(elf_file: &[u8]) {

libs/rust/ftl_server/src/lib.rs

@@ -10,7 +10,6 @@ use core::sync::atomic::Ordering;
 pub mod print;
 
 pub mod start;
-mod supercall;
 
 #[cfg(not(feature = "kernel"))]
 mod panic;

libs/rust/ftl_server/src/panic.rs

@@ -1,6 +1,9 @@
+use crate::start::start_info;
+
 #[cfg(target_os = "none")]
 #[panic_handler]
 fn panic(info: &core::panic::PanicInfo) -> ! {
-    error!("server panic: {info:?}");
+    error!("server panic: {info}");
+    (start_info().sys_panic)();
     loop {}
 }

libs/rust/ftl_server/src/start.rs

@@ -5,6 +5,7 @@ static START_INFO: AtomicUsize = AtomicUsize::new(0);
 
 pub struct StartInfo {
     pub sys_print: extern "Rust" fn(bytes: &[u8]),
+    pub sys_panic: extern "Rust" fn(),
 }
 
 pub fn start_info() -> &'static StartInfo {