Merge pull request #38 from guttatus/fmt

feat(prototyper): Optimize console output format

prototyper/src/fail.rs

@@ -33,10 +33,10 @@ pub fn device_tree_deserialize_root<'a>(
 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",
@@ -45,7 +45,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()
@@ -64,18 +64,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

@@ -14,13 +14,13 @@ macro_rules! print {
 
 #[allow(unused)]
 macro_rules! println {
-    () => ($crate::print!("\n"));
+    () => ($crate::print!("\n\r"));
     ($($arg:tt)*) => {{
         use core::fmt::Write;
         if unsafe {$crate::board::BOARD.have_console()} {
             let console = unsafe { $crate::board::BOARD.sbi.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

@@ -41,9 +41,6 @@ extern "C" fn rust_main(_hart_id: usize, opaque: usize, nonstandard_a2: usize) {
         let dtb = dt::parse_device_tree(fdt_addr).unwrap_or_else(fail::device_tree_format);
         let dtb = dtb.share();
 
-        // 1. Init FDT
-        // parse the device tree.
-        // TODO: should remove `fail:device_tree_format`.
         unsafe {
             BOARD.init(&dtb);
             BOARD.print_board_info();
@@ -188,20 +185,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 {}
 }