kernel-hal: merge commom serial code

equation314 · equation314 · commit e1fb260a95fc · 2021-09-13T21:22:03.000+08:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,9 +1,10 @@
 [workspace]
 members = [
     "zircon-object",
+    "zircon-syscall",
     "zircon-loader",
     "linux-object",
-    "zircon-syscall",
+    "linux-syscall",
     "linux-loader",
     "kernel-hal",
 ]
@@ -12,5 +13,4 @@ exclude = [
     "zircon-user",
     "zCore",
     "rboot",
-    "linux-syscall",
 ]
diff --git a/kernel-hal/Cargo.toml b/kernel-hal/Cargo.toml
@@ -33,7 +33,7 @@ async-std = { version = "1.9", optional = true }
 # Bare-metal mode
 [target.'cfg(target_os = "none")'.dependencies]
 executor = { git = "https://github.com/rcore-os/executor.git", rev = "a2d02ee9" }
-naive-timer = "0.1.0"
+naive-timer = "0.2.0"
 lazy_static = { version = "1.4", features = ["spin_no_std"] }
 bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator", rev = "b3f9f51" }
 # rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "6df6cd2" }
diff --git a/kernel-hal/src/bare/arch/riscv/interrupt.rs b/kernel-hal/src/bare/arch/riscv/interrupt.rs
@@ -2,7 +2,7 @@ use alloc::boxed::Box;
 use riscv::register::{sie, sstatus};
 use spin::Mutex;
 
-use super::{consts, plic, serial, trap, uart};
+use super::{plic, trap};
 use crate::utils::irq_manager::IrqManager;
 
 // IRQ
@@ -18,22 +18,13 @@ lazy_static::lazy_static! {
 #[allow(dead_code)]
 fn init_soft() {
     unsafe { sie::set_ssoft() };
-    sbi_println!("+++ setup soft int! +++");
+    info!("+++ setup soft int! +++");
 }
 
 fn init_ext() {
     unsafe { sie::set_sext() };
     plic::init();
-    sbi_println!("+++ Setting up PLIC +++");
-}
-
-fn init_uart() {
-    uart::init(consts::UART_BASE);
-
-    //但当没有SBI_CONSOLE_PUTCHAR时，却为什么不行？
-    serial::uart_print_fmt(format_args!("UART output testing\n\r"));
-
-    sbi_println!("+++ Setting up UART interrupts +++");
+    info!("+++ Setting up PLIC +++");
 }
 
 fn init_irq() {
@@ -47,10 +38,9 @@ fn init_irq() {
 
 pub(super) fn init() {
     unsafe { sstatus::set_sie() };
-    init_uart();
     init_ext();
     init_irq();
-    sbi_println!("+++ setup interrupt +++");
+    info!("+++ setup interrupt OK +++");
 }
 
 hal_fn_impl! {
diff --git a/kernel-hal/src/bare/arch/riscv/mod.rs b/kernel-hal/src/bare/arch/riscv/mod.rs
@@ -1,8 +1,5 @@
 #![allow(dead_code)]
 
-#[macro_use]
-pub mod serial;
-
 mod consts;
 mod plic;
 mod sbi;
@@ -14,6 +11,7 @@ pub mod context;
 pub mod cpu;
 pub mod interrupt;
 pub mod mem;
+pub mod serial;
 pub mod special;
 pub mod timer;
 pub mod vm;
@@ -22,8 +20,7 @@ pub fn init() {
     vm::remap_the_kernel().unwrap();
     interrupt::init();
     timer::init();
-
-    unsafe { asm!("ebreak") };
+    uart::init(consts::UART_BASE);
 
     #[cfg(feature = "board_qemu")]
     {
diff --git a/kernel-hal/src/bare/arch/riscv/plic.rs b/kernel-hal/src/bare/arch/riscv/plic.rs
@@ -84,7 +84,7 @@ pub(super) fn handle_interrupt() {
         match interrupt {
             1..=8 => {
                 //virtio::handle_interrupt(interrupt);
-                sbi_println!("plic virtio external interrupt: {}", interrupt);
+                info!("plic virtio external interrupt: {}", interrupt);
             }
             UART0_INT_NUM => {
                 //UART中断ID是10
@@ -94,7 +94,7 @@ pub(super) fn handle_interrupt() {
                 //interrupt::try_process_serial();
             }
             _ => {
-                sbi_println!("Unknown external interrupt: {}", interrupt);
+                info!("Unknown external interrupt: {}", interrupt);
             }
         }
         //这将复位pending的中断，允许UART再次中断。
diff --git a/kernel-hal/src/bare/arch/riscv/serial.rs b/kernel-hal/src/bare/arch/riscv/serial.rs
@@ -1,16 +1,7 @@
-use alloc::{boxed::Box, collections::VecDeque, vec::Vec};
 use core::fmt::{Arguments, Result, Write};
 
-use spin::Mutex;
-
 use super::{sbi, uart};
 
-lazy_static::lazy_static! {
-    static ref STDIN: Mutex<VecDeque<u8>> = Mutex::new(VecDeque::new());
-    static ref STDIN_CALLBACK: Mutex<Vec<Box<dyn Fn() -> bool + Send + Sync>>> =
-        Mutex::new(Vec::new());
-}
-
 struct SbiConsole;
 struct UartConsole;
 
@@ -34,52 +25,10 @@ impl Write for UartConsole {
     }
 }
 
-pub(super) fn sbi_print_fmt(fmt: Arguments) {
-    SbiConsole.write_fmt(fmt).unwrap();
-}
-
-pub(super) fn uart_print_fmt(fmt: Arguments) {
-    UartConsole.write_fmt(fmt).unwrap();
-}
-
 hal_fn_impl! {
     impl mod crate::hal_fn::serial {
-        fn serial_put(x: u8) {
-            if (x == b'\r') || (x == b'\n') {
-                STDIN.lock().push_back(b'\n');
-                STDIN.lock().push_back(b'\r');
-            }else{
-                STDIN.lock().push_back(x);
-            }
-            STDIN_CALLBACK.lock().retain(|f| !f());
-        }
-
-        fn serial_set_callback(callback: Box<dyn Fn() -> bool + Send + Sync>) {
-            STDIN_CALLBACK.lock().push(callback);
-        }
-
-        fn serial_read(buf: &mut [u8]) -> usize {
-            let mut stdin = STDIN.lock();
-            let len = stdin.len().min(buf.len());
-            for c in &mut buf[..len] {
-                *c = stdin.pop_front().unwrap();
-            }
-            len
-        }
-
         fn serial_write_fmt(fmt: Arguments) {
-            uart_print_fmt(fmt);
+            UartConsole.write_fmt(fmt).unwrap();
         }
     }
 }
-
-macro_rules! sbi_print {
-	($($arg:tt)*) => ({
-        crate::serial::sbi_print_fmt(format_args!($($arg)*));
-	});
-}
-
-macro_rules! sbi_println {
-	() => (sbi_print!("\n"));
-	($($arg:tt)*) => (sbi_print!("{}\n", format_args!($($arg)*)));
-}
diff --git a/kernel-hal/src/bare/arch/riscv/timer.rs b/kernel-hal/src/bare/arch/riscv/timer.rs
@@ -3,11 +3,6 @@ use riscv::register::{sie, time};
 
 fn get_cycle() -> u64 {
     time::read() as u64
-    /*
-    unsafe {
-        MMIO_MTIME.read_volatile()
-    }
-    */
 }
 
 pub(super) fn timer_set_next() {
@@ -16,14 +11,13 @@ pub(super) fn timer_set_next() {
     super::sbi::set_timer(get_cycle() + TIMEBASE);
 }
 
-pub fn timer_now() -> Duration {
-    const FREQUENCY: u64 = 10_000_000; // ???
-    let time = get_cycle();
-    //bare_println!("timer_now(): {:?}", time);
-    Duration::from_nanos(time * 1_000_000_000 / FREQUENCY as u64)
-}
-
 pub(super) fn init() {
     unsafe { sie::set_stimer() };
     timer_set_next();
 }
+
+pub(crate) fn timer_now() -> Duration {
+    const FREQUENCY: u64 = 10_000_000; // ???
+    let time = get_cycle();
+    Duration::from_nanos(time * 1_000_000_000 / FREQUENCY as u64)
+}
diff --git a/kernel-hal/src/bare/arch/riscv/trap.rs b/kernel-hal/src/bare/arch/riscv/trap.rs
@@ -6,7 +6,7 @@ use super::{plic, sbi};
 use crate::MMUFlags;
 
 fn breakpoint(sepc: &mut usize) {
-    sbi_println!("Exception::Breakpoint: A breakpoint set @0x{:x} ", sepc);
+    info!("Exception::Breakpoint: A breakpoint set @0x{:x} ", sepc);
 
     //sepc为触发中断指令ebreak的地址
     //防止无限循环中断，让sret返回时跳转到sepc的下一条指令地址
@@ -17,14 +17,12 @@ pub(super) fn super_timer() {
     super::timer::timer_set_next();
     crate::timer::timer_tick();
 
-    //sbi_print!(".");
-
     //发生外界中断时，epc的指令还没有执行，故无需修改epc到下一条
 }
 
 fn super_soft() {
     sbi::clear_ipi();
-    sbi_println!("Interrupt::SupervisorSoft!");
+    info!("Interrupt::SupervisorSoft!");
 }
 
 fn page_fault(access_flags: MMUFlags) {
diff --git a/kernel-hal/src/bare/arch/riscv/uart.rs b/kernel-hal/src/bare/arch/riscv/uart.rs
@@ -88,21 +88,6 @@ pub(super) fn handle_interrupt() {
         if let Some(c) = uart.lock().get() {
             //CONSOLE
             crate::serial::serial_put(c);
-
-            /*
-            * 因serial_write()已可以被回调输出了，这里则不再需要了
-            match c {
-                0x7f => { //0x8 [backspace] ; 而实际qemu运行，[backspace]键输出0x7f, 表示del
-                    bare_print!("{} {}", 8 as char, 8 as char);
-                },
-                10 | 13 => { // 新行或回车
-                    bare_println!();
-                },
-                _ => {
-                    bare_print!("{}", c as char);
-                },
-            }
-            */
         }
     }
 }
diff --git a/kernel-hal/src/bare/arch/x86_64/interrupt.rs b/kernel-hal/src/bare/arch/x86_64/interrupt.rs
@@ -241,7 +241,7 @@ fn timer() {
 
 fn com1() {
     let c = super::serial::COM1.lock().receive();
-    super::serial::serial_put(c);
+    crate::serial::serial_put(c);
 }
 
 /*
diff --git a/kernel-hal/src/bare/arch/x86_64/serial.rs b/kernel-hal/src/bare/arch/x86_64/serial.rs
@@ -18,30 +18,8 @@ pub(super) fn init() {
 
 hal_fn_impl! {
     impl mod crate::hal_fn::serial {
-        fn serial_put(x: u8) {
-            let x = if x == b'\r' { b'\n' } else { x };
-            STDIN.lock().push_back(x);
-            STDIN_CALLBACK.lock().retain(|f| !f());
-        }
-
-        fn serial_set_callback(callback: Box<dyn Fn() -> bool + Send + Sync>) {
-            STDIN_CALLBACK.lock().push(callback);
-        }
-
-        fn serial_read(buf: &mut [u8]) -> usize {
-            let mut stdin = STDIN.lock();
-            let len = stdin.len().min(buf.len());
-            for c in &mut buf[..len] {
-                *c = stdin.pop_front().unwrap();
-            }
-            len
-        }
-
         fn serial_write_fmt(fmt: Arguments) {
             COM1.lock().write_fmt(fmt).unwrap();
-            // if let Some(console) = CONSOLE.lock().as_mut() {
-            //     console.write_fmt(fmt).unwrap();
-            // }
         }
     }
 }
diff --git a/kernel-hal/src/common/mod.rs b/kernel-hal/src/common/mod.rs
@@ -5,6 +5,7 @@ pub mod addr;
 pub mod context;
 pub mod future;
 pub mod mem;
+pub mod serial;
 pub mod user;
 pub mod vdso;
 pub mod vm;
diff --git a/kernel-hal/src/common/serial.rs b/kernel-hal/src/common/serial.rs
@@ -0,0 +1,36 @@
+use alloc::{boxed::Box, collections::VecDeque, vec::Vec};
+
+use spin::Mutex;
+
+lazy_static::lazy_static! {
+    static ref STDIN: Mutex<VecDeque<u8>> = Mutex::new(VecDeque::new());
+    static ref STDIN_CALLBACK: Mutex<Vec<Box<dyn Fn() -> bool + Send + Sync>>> =
+        Mutex::new(Vec::new());
+}
+
+/// Put a char to serial buffer.
+pub fn serial_put(x: u8) {
+    let x = if x == b'\r' { b'\n' } else { x };
+    STDIN.lock().push_back(x);
+    STDIN_CALLBACK.lock().retain(|f| !f());
+}
+
+/// Register a callback of serial readable event.
+pub fn serial_set_callback(callback: Box<dyn Fn() -> bool + Send + Sync>) {
+    STDIN_CALLBACK.lock().push(callback);
+}
+
+/// Read a string from serial buffer.
+pub fn serial_read(buf: &mut [u8]) -> usize {
+    let mut stdin = STDIN.lock();
+    let len = stdin.len().min(buf.len());
+    for c in &mut buf[..len] {
+        *c = stdin.pop_front().unwrap();
+    }
+    len
+}
+
+/// Print a string to serial.
+pub fn serial_write(s: &str) {
+    crate::serial::serial_write_fmt(format_args!("{}", s));
+}
diff --git a/kernel-hal/src/hal_fn.rs b/kernel-hal/src/hal_fn.rs
@@ -122,26 +122,12 @@ hal_fn_def! {
         pub fn timer_set(deadline: Duration, callback: Box<dyn FnOnce(Duration) + Send + Sync>);
 
         /// Check timers, call when timer interrupt happened.
-        pub fn timer_tick();
+        pub(crate) fn timer_tick();
     }
 
-    pub mod serial {
-        /// Register a callback of serial readable event.
-        pub fn serial_set_callback(callback: Box<dyn Fn() -> bool + Send + Sync>);
-
-        /// Put a char to serial buffer.
-        pub fn serial_put(x: u8);
-
-        /// Read a string from serial buffer.
-        pub fn serial_read(buf: &mut [u8]) -> usize;
-
+    pub mod serial: common::serial {
         /// Print format string and its arguments to serial.
         pub fn serial_write_fmt(fmt: Arguments);
-
-        /// Print a string to serial.
-        pub fn serial_write(s: &str) {
-            serial_write_fmt(format_args!("{}", s));
-        }
     }
 
     pub mod rand {
diff --git a/kernel-hal/src/libos/serial.rs b/kernel-hal/src/libos/serial.rs
diff --git a/linux-loader/src/lib.rs b/linux-loader/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ pub(super) fn handle_interrupt() {`
`84`	`84`	`match interrupt {`
`85`	`85`	`1..=8 => {`
`86`	`86`	`//virtio::handle_interrupt(interrupt);`
`87`		`- sbi_println!("plic virtio external interrupt: {}", interrupt);`
	`87`	`+ info!("plic virtio external interrupt: {}", interrupt);`
`88`	`88`	`}`
`89`	`89`	`UART0_INT_NUM => {`
`90`	`90`	`//UART中断ID是10`
`@@ -94,7 +94,7 @@ pub(super) fn handle_interrupt() {`
`94`	`94`	`//interrupt::try_process_serial();`
`95`	`95`	`}`
`96`	`96`	`_ => {`
`97`		`- sbi_println!("Unknown external interrupt: {}", interrupt);`
	`97`	`+ info!("Unknown external interrupt: {}", interrupt);`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`//这将复位pending的中断，允许UART再次中断。`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ fn timer() {`
`241`	`241`
`242`	`242`	`fn com1() {`
`243`	`243`	`let c = super::serial::COM1.lock().receive();`
`244`		`- super::serial::serial_put(c);`
	`244`	`+ crate::serial::serial_put(c);`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`/*`