add the print part and now it can work

rel4team · Aug 28, 2024 · 9d85242 · 9d85242
1 parent 448343c
commit 9d85242
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/kernel/src/arch/aarch64/exception.rs b/kernel/src/arch/aarch64/exception.rs
@@ -15,8 +15,8 @@ use aarch64_cpu::registers::Readable;
 use aarch64_cpu::registers::TTBR0_EL1;
 use log::debug;
 use sel4_common::arch::ArchReg::*;
+use sel4_common::print;
 use sel4_common::fault::seL4_Fault_t;
-use sel4_common::println;
 use sel4_common::sel4_config::seL4_MsgMaxLength;
 use sel4_common::structures::exception_t;
 use sel4_common::utils::global_read;
@@ -27,35 +27,36 @@ use super::instruction::*;
 
 #[no_mangle]
 pub fn handleUnknownSyscall(w: isize) -> exception_t {
+	let thread = get_currenct_thread();
     if w == SysDebugPutChar {
-        // println!("debug put char");
+		print!("{}",thread.tcbArch.get_register(Cap) as u8 as char);
         return exception_t::EXCEPTION_NONE;
     }
     if w == SysDebugDumpScheduler {
-        println!("debug dump scheduler");
+		// unimplement debug
+        // println!("debug dump scheduler");
         return exception_t::EXCEPTION_NONE;
     }
     if w == SysDebugHalt {
-        println!("debug halt");
+		// unimplement debug
+        // println!("debug halt");
         return exception_t::EXCEPTION_NONE;
     }
     if w == SysDebugSnapshot {
-        println!("debug snapshot");
+		// unimplement debug
+        // println!("debug snapshot");
         return exception_t::EXCEPTION_NONE;
     }
     if w == SysDebugCapIdentify {
         // println!("debug cap identify");
-        let thread = get_currenct_thread();
         let cptr = thread.tcbArch.get_register(Cap);
         let lu_ret = lookupCapAndSlot(thread, cptr);
         let cap_type = lu_ret.cap.get_cap_type();
         thread.tcbArch.set_register(Cap, cap_type as usize);
         return exception_t::EXCEPTION_NONE;
     }
     if w == SysDebugNameThread {
-        println!("debug name thread");
-
-        let thread = get_currenct_thread();
+        // println!("debug name thread");
         let cptr = thread.tcbArch.get_register(Cap);
         let lu_ret = lookupCapAndSlot(thread, cptr);
         let cap_type = lu_ret.cap.get_cap_type();
@@ -76,8 +77,7 @@ pub fn handleUnknownSyscall(w: isize) -> exception_t {
             halt();
         }
 
-        //         setThreadName(TCB_PTR(cap_thread_cap_get_capTCBPtr(lu_ret.cap)), name);
-        //         // printf("hello SysDebugNameThread, name: %s\n", name);
+        // setThreadName(TCB_PTR(cap_thread_cap_get_capTCBPtr(lu_ret.cap)), name);
         return exception_t::EXCEPTION_NONE;
     }
     if w == SysGetClock {

diff --git a/kernel/src/arch/riscv/exception.rs b/kernel/src/arch/riscv/exception.rs
@@ -13,65 +13,67 @@ use crate::syscall::{
 use log::debug;
 use sel4_common::arch::ArchReg::*;
 use sel4_common::fault::seL4_Fault_t;
-use sel4_common::println;
 use sel4_common::sel4_config::seL4_MsgMaxLength;
 use sel4_common::structures::exception_t;
 use sel4_cspace::arch::CapTag;
+use sel4_common::print;
 use sel4_task::{activateThread, get_currenct_thread, schedule};
 
 #[no_mangle]
 pub fn handleUnknownSyscall(w: isize) -> exception_t {
+	let thread = get_currenct_thread();
     if w == SysDebugPutChar {
+		print!("{}",thread.tcbArch.get_register(Cap) as u8 as char);
         return exception_t::EXCEPTION_NONE;
     }
     if w == SysDebugDumpScheduler {
-        println!("debug dump scheduler");
+		// unimplement debug
+        // println!("debug dump scheduler");
         return exception_t::EXCEPTION_NONE;
     }
     if w == SysDebugHalt {
-        println!("debug halt");
+		// unimplement debug
+        // println!("debug halt");
         return exception_t::EXCEPTION_NONE;
     }
     if w == SysDebugSnapshot {
-        println!("debug snap shot");
+		// unimplement debug
+        // println!("debug snap shot");
         return exception_t::EXCEPTION_NONE;
     }
     if w == SysDebugCapIdentify {
-        let thread = get_currenct_thread();
         let cptr = thread.tcbArch.get_register(Cap);
         let lu_ret = lookupCapAndSlot(thread, cptr);
         let cap_type = lu_ret.cap.get_cap_type();
         thread.tcbArch.set_register(Cap, cap_type as usize);
         return exception_t::EXCEPTION_NONE;
     }
     if w == SysDebugNameThread {
-        println!("debug name thread");
-        let thread = get_currenct_thread();
         let cptr = thread.tcbArch.get_register(Cap);
         let lu_ret = lookupCapAndSlot(thread, cptr);
         let cap_type = lu_ret.cap.get_cap_type();
 
         if cap_type != CapTag::CapThreadCap {
-            println!("SysDebugNameThread: cap is not a TCB, halting");
+            debug!("SysDebugNameThread: cap is not a TCB, halting");
             halt();
         }
         let name = lookupIPCBuffer(true, thread) + 1;
         if name == 0 {
-            println!("SysDebugNameThread: Failed to lookup IPC buffer, halting");
+            debug!("SysDebugNameThread: Failed to lookup IPC buffer, halting");
             halt();
         }
 
         let len = strnlen(name as *const u8, seL4_MsgMaxLength * 8);
         if len == seL4_MsgMaxLength * 8 {
-            println!("SysDebugNameThread: Name too long, halting");
+            debug!("SysDebugNameThread: Name too long, halting");
             halt();
         }
-
+
+        // setThreadName(TCB_PTR(cap_thread_cap_get_capTCBPtr(lu_ret.cap)), name);
         return exception_t::EXCEPTION_NONE;
     }
     if w == SysGetClock {
         let current = read_time();
-        let thread = get_currenct_thread();
         thread.tcbArch.set_register(Cap, current);
         return exception_t::EXCEPTION_NONE;
     }