test: use rcore_console for test-kernel

Signed-off-by: YdrMaster <[email protected]>

Author: YdrMaster

Cargo.lock

@@ -10,5 +10,4 @@ sbi-rt = "0.0.2"
 riscv = "0.9.0"
 r0 = "1"
 uart_16550 = "0.2"
-
-console = { git = "https://github.com/YdrMaster/rCore-Tutorial-in-single-workspace" }
+rcore-console = "0.0.0"

legacy-console-bench/Cargo.toml

@@ -4,8 +4,7 @@
 #![deny(warnings)]
 
 use core::mem::MaybeUninit;
-
-use console::log;
+use rcore_console::log;
 use riscv::register::*;
 use sbi_rt::*;
 use uart_16550::MmioSerialPort;
@@ -29,21 +28,21 @@ unsafe extern "C" fn _start(hartid: usize, device_tree_paddr: usize) -> ! {
     )
 }
 
-extern "C" fn rust_main(_hartid: usize, _dtb_pa: usize) -> ! {
+extern "C" fn rust_main(hartid: usize, _dtb_pa: usize) -> ! {
     extern "C" {
         static mut sbss: u64;
         static mut ebss: u64;
     }
     unsafe { r0::zero_bss(&mut sbss, &mut ebss) };
     unsafe { UART = MaybeUninit::new(MmioSerialPort::new(0x1000_0000)) };
-    console::init_console(&Console);
-    console::set_log_level(option_env!("LOG"));
-    console::test_log();
+    rcore_console::init_console(&Console);
+    rcore_console::set_log_level(option_env!("LOG"));
+    rcore_console::test_log();
 
     let t0 = time::read();
 
     for _ in 0..0xffff {
-        let _ = sbi_rt::get_marchid();
+        let _ = sbi_rt::send_ipi(1 << hartid, 0);
     }
 
     let t1 = time::read();
@@ -63,9 +62,9 @@ fn panic(info: &core::panic::PanicInfo) -> ! {
 struct Console;
 static mut UART: MaybeUninit<MmioSerialPort> = MaybeUninit::uninit();
 
-impl console::Console for Console {
+impl rcore_console::Console for Console {
     #[inline]
     fn put_char(&self, c: u8) {
-        unsafe { UART.assume_init_mut().send(c) }
+        unsafe { UART.assume_init_mut() }.send(c);
     }
 }

legacy-console-bench/src/main.rs

@@ -14,4 +14,5 @@ riscv = "0.9.0"
 spin = "0.9"
 r0 = "1"
 uart_16550 = "0.2"
+rcore-console = "0.0.0"
 dtb-walker = "=0.2.0-alpha.3"

test-kernel/Cargo.toml

@@ -4,10 +4,12 @@
 #![deny(warnings)]
 
 #[macro_use]
-mod console;
+extern crate rcore_console;
 
-use core::arch::asm;
+use core::{arch::asm, mem::MaybeUninit};
 use sbi_testing::sbi;
+use spin::Mutex;
+use uart_16550::MmioSerialPort;
 
 /// 内核入口。
 ///
@@ -44,7 +46,9 @@ extern "C" fn rust_main(hartid: usize, dtb_pa: usize) -> ! {
         frequency,
         uart,
     } = BoardInfo::parse(dtb_pa);
-    console::init(uart);
+    *UART.lock() = MaybeUninit::new(unsafe { MmioSerialPort::new(uart) });
+    rcore_console::init_console(&Console);
+    rcore_console::set_log_level(option_env!("LOG"));
     println!(
         r"
  _____         _     _  __                    _
@@ -137,3 +141,22 @@ impl BoardInfo {
         ans
     }
 }
+
+struct Console;
+static UART: Mutex<MaybeUninit<MmioSerialPort>> = Mutex::new(MaybeUninit::uninit());
+
+impl rcore_console::Console for Console {
+    #[inline]
+    fn put_char(&self, c: u8) {
+        unsafe { UART.lock().assume_init_mut() }.send(c);
+    }
+
+    #[inline]
+    fn put_str(&self, s: &str) {
+        let mut uart = UART.lock();
+        let uart = unsafe { uart.assume_init_mut() };
+        for c in s.bytes() {
+            uart.send(c);
+        }
+    }
+}