feat(prototyper): Optimize console output format

prototyper/src/fail.rs

@@ -12,7 +12,7 @@ use riscv::register::mstatus;
 #[cold]
 pub fn device_tree_format(err: dt::ParseDeviceTreeError) -> Dtb {
     match err {
-        ParseDeviceTreeError::Format => error!("- FDT format error"),
+        ParseDeviceTreeError::Format => error!("FDT format error"),
     }
     reset::fail()
 }
@@ -30,10 +30,10 @@ pub fn device_tree_deserialize<'a>(err: serde_device_tree::error::Error) -> Tree
 pub fn invalid_dynamic_data(err: dynamic::DynamicError) -> (mstatus::MPP, usize) {
     error!("Invalid data in dynamic information:");
     if err.invalid_mpp {
-        error!("- dynamic information contains invalid privilege mode");
+        error!("* dynamic information contains invalid privilege mode");
     }
     if err.invalid_next_addr {
-        error!("- dynamic information contains invalid next jump address");
+        error!("* dynamic information contains invalid next jump address");
     }
     let explain_next_mode = match err.bad_info.next_mode {
         3 => "Machine",
@@ -42,7 +42,7 @@ pub fn invalid_dynamic_data(err: dynamic::DynamicError) -> (mstatus::MPP, usize)
         _ => "Invalid",
     };
     error!(
-        "help: dynamic information contains magic value 0x{:x}, version {}, next jump address 0x{:x}, next privilege mode {} ({}), options {:x}, boot hart ID {}",
+        "@ help: dynamic information contains magic value 0x{:x}, version {}, next jump address 0x{:x}, next privilege mode {} ({}), options {:x}, boot hart ID {}",
         err.bad_info.magic, err.bad_info.version, err.bad_info.next_addr, err.bad_info.next_mode, explain_next_mode, err.bad_info.options, err.bad_info.boot_hart
     );
     reset::fail()
@@ -61,18 +61,18 @@ pub fn no_dynamic_info_available(err: dynamic::DynamicReadError) -> dynamic::Dyn
         error!("No valid dynamic information available:");
         if let Some(bad_magic) = err.bad_magic {
             error!(
-                "- tried to identify dynamic information, but found invalid magic number 0x{:x}",
+                "* tried to identify dynamic information, but found invalid magic number 0x{:x}",
                 bad_magic
             );
         }
         if let Some(bad_version) = err.bad_version {
-            error!("- tries to identify version of dynamic information, but the version number {} is not supported", bad_version);
+            error!("* tries to identify version of dynamic information, but the version number {} is not supported", bad_version);
         }
         if err.bad_magic.is_none() {
-            error!("help: magic number is valid")
+            error!("@ help: magic number is valid")
         }
         if err.bad_version.is_none() {
-            error!("help: dynamic information version is valid")
+            error!("@ help: dynamic information version is valid")
         }
     }
     reset::fail()

prototyper/src/macros.rs

@@ -12,11 +12,11 @@ macro_rules! print {
 
 #[allow(unused)]
 macro_rules! println {
-    () => ($crate::print!("\n"));
+    () => ($crate::print!("\n\r"));
     ($($arg:tt)*) => {{
         use core::fmt::Write;
         let console = unsafe { $crate::board::SBI_IMPL.assume_init_mut() }.console.as_mut().unwrap();
         console.write_fmt(core::format_args!($($arg)*)).unwrap();
-        console.write_char('\n').unwrap();
+        console.write_str("\n\r").unwrap();
     }}
 }

prototyper/src/main.rs

@@ -270,20 +270,12 @@ unsafe extern "C" fn relocation_update() {
 #[panic_handler]
 fn panic(info: &core::panic::PanicInfo) -> ! {
     use riscv::register::*;
-    println!(
-        "[rustsbi-panic] hart {} {info}",
-        riscv::register::mhartid::read()
-    );
-    println!(
-        "-----------------------------
-> mcause:  {:?}
-> mepc:    {:#018x}
-> mtval:   {:#018x}
------------------------------",
-        mcause::read().cause(),
-        mepc::read(),
-        mtval::read()
-    );
-    println!("[rustsbi-panic] system shutdown scheduled due to RustSBI panic");
+    error!("Hart {} {info}", riscv::register::mhartid::read());
+    error!("-----------------------------");
+    error!("mcause:  {:?}", mcause::read().cause());
+    error!("mepc:    {:#018x}", mepc::read());
+    error!("mtval:   {:#018x}", mtval::read());
+    error!("-----------------------------");
+    error!("System shutdown scheduled due to RustSBI panic");
     loop {}
 }