fix: put console in one-shot mutex

Signed-off-by: Martin Kröning <[email protected]>

Cargo.toml

@@ -10,6 +10,7 @@ edition = "2021"
 align-address = "0.1"
 hermit-entry = { version = "0.9", features = ["loader"] }
 log = "0.4"
+one-shot-mutex = "0.1"
 sptr = "0.3"
 vm-fdt = { version = "0.3", default-features = false, features = ["alloc"] }
 

src/console.rs

@@ -1,5 +1,7 @@
 use core::fmt;
 
+use one_shot_mutex::OneShotMutex;
+
 pub struct Console(());
 
 impl fmt::Write for Console {
@@ -11,4 +13,4 @@ impl fmt::Write for Console {
 	}
 }
 
-pub static mut CONSOLE: Console = Console(());
+pub static CONSOLE: OneShotMutex<Console> = OneShotMutex::new(Console(()));

src/main.rs

@@ -31,7 +31,5 @@ extern crate alloc;
 fn _print(args: core::fmt::Arguments<'_>) {
 	use core::fmt::Write;
 
-	unsafe {
-		console::CONSOLE.write_fmt(args).unwrap();
-	}
+	console::CONSOLE.lock().write_fmt(args).unwrap();
 }

src/none.rs

@@ -44,7 +44,7 @@ pub(crate) unsafe extern "C" fn loader_main() -> ! {
 #[panic_handler]
 fn panic(info: &core::panic::PanicInfo<'_>) -> ! {
 	// We can't use `println!` or related macros, because `_print` unwraps a result and might panic again
-	writeln!(unsafe { &mut console::CONSOLE }, "[LOADER] {info}").ok();
+	writeln!(console::CONSOLE.lock(), "[LOADER] {info}").ok();
 
 	loop {}
 }