From e594a4af32eef992dd0e2635aad4f9aa17516cff Mon Sep 17 00:00:00 2001 From: Jackey-Huo Date: Thu, 2 May 2019 21:32:19 +0800 Subject: [PATCH] stage debug code for output --- kernel/src/arch/riscv32/mod.rs | 13 ++++++++++++- kernel/src/shell.rs | 3 +++ tools/addr2line.py | 0 user | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) mode change 100644 => 100755 tools/addr2line.py diff --git a/kernel/src/arch/riscv32/mod.rs b/kernel/src/arch/riscv32/mod.rs index 75b7ccc..a0c5cd9 100644 --- a/kernel/src/arch/riscv32/mod.rs +++ b/kernel/src/arch/riscv32/mod.rs @@ -44,10 +44,17 @@ pub extern "C" fn rust_main(hartid: usize, device_tree_paddr: usize) -> ! { } println!( - "Hello RISCV! in hart {}, device tree @ {:#x}", + "Hello fucking RISCV! in hart {}, device tree @ {:#x}", hartid, device_tree_vaddr ); + //while true { + //let fuck_char = get_char_fuck(); + //if fuck_char as u8 != 254 { + //print!("{0}", fuck_char as char); + //} + //} + crate::logging::init(); interrupt::init(); memory::init(device_tree_vaddr); @@ -74,6 +81,10 @@ fn others_main() -> ! { crate::kmain(); } +fn get_char_fuck() -> char { + io::getchar() +} + static AP_CAN_INIT: AtomicBool = AtomicBool::new(false); #[cfg(not(feature = "board_u540"))] diff --git a/kernel/src/shell.rs b/kernel/src/shell.rs index 84c4367..3e28227 100644 --- a/kernel/src/shell.rs +++ b/kernel/src/shell.rs @@ -19,6 +19,7 @@ pub fn add_user_shell() { // // #[cfg(not(target_arch = "x86_64"))] let init_shell = "/busybox"; //from docker-library + println!("use the fucking up busybox"); #[cfg(target_arch = "x86_64")] let init_envs = @@ -42,10 +43,12 @@ pub fn add_user_shell() { pub fn add_user_shell() { let cmdline = CMDLINE.read(); let inode = ROOT_INODE.lookup(&cmdline).unwrap(); + println!("not use the fucking up busybox"); processor().manager().add(Thread::new_user( &inode, cmdline.split(' ').map(|s| s.into()).collect(), Vec::new(), + Vec::new(), )); } diff --git a/tools/addr2line.py b/tools/addr2line.py old mode 100644 new mode 100755 diff --git a/user b/user index 05f0efd..8dbc0ed 160000 --- a/user +++ b/user @@ -1 +1 @@ -Subproject commit 05f0efd3fda084109e4b6da8ff30ecb1557a267f +Subproject commit 8dbc0edb935a62d748aaac39258d4a985de0ae17