From 86dd38f7fa715a4422433463645b55239b0be755 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Mon, 21 Jun 2021 14:24:16 +0800 Subject: [PATCH] kernel: fix hosted build Signed-off-by: Sean Cross --- kernel/src/arch/hosted/irq.rs | 4 ++++ kernel/src/arch/hosted/mem.rs | 2 ++ kernel/src/arch/hosted/process.rs | 6 ++++++ kernel/src/debug/mod.rs | 6 +++--- kernel/src/mem.rs | 4 ++-- kernel/src/services.rs | 5 +++++ 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/kernel/src/arch/hosted/irq.rs b/kernel/src/arch/hosted/irq.rs index 7b5c3060a..72680834a 100644 --- a/kernel/src/arch/hosted/irq.rs +++ b/kernel/src/arch/hosted/irq.rs @@ -3,6 +3,10 @@ use xous_kernel::{PID, TID}; +pub unsafe fn take_isr_return_pair() -> Option<(PID, TID)> { + None +} + pub fn enable_irq(_irq_no: usize) { unimplemented!() } diff --git a/kernel/src/arch/hosted/mem.rs b/kernel/src/arch/hosted/mem.rs index b301b1b9a..fa8ae8d21 100644 --- a/kernel/src/arch/hosted/mem.rs +++ b/kernel/src/arch/hosted/mem.rs @@ -48,6 +48,8 @@ impl MemoryMapping { ) -> Result<(), Error> { Ok(()) } + + pub fn print_map(&self) {} } /// Determine whether a virtual address has been mapped diff --git a/kernel/src/arch/hosted/process.rs b/kernel/src/arch/hosted/process.rs index 5f458c4c7..12742ed48 100644 --- a/kernel/src/arch/hosted/process.rs +++ b/kernel/src/arch/hosted/process.rs @@ -394,6 +394,12 @@ impl Process { }); Ok(()) } + + pub fn print_all_threads(&self) {} } impl Thread {} + +pub fn current_tid() -> TID { + 1 +} diff --git a/kernel/src/debug/mod.rs b/kernel/src/debug/mod.rs index 1df7aa030..9dd00112e 100644 --- a/kernel/src/debug/mod.rs +++ b/kernel/src/debug/mod.rs @@ -163,7 +163,7 @@ pub fn irq(_irq_number: usize, _arg: *mut usize) { } fn process_irq_character(b: u8) { - #[cfg(feature = "gdbserver")] + #[cfg(all(feature = "gdbserver", baremetal))] if gdb_server::handle(b) { return; } @@ -259,7 +259,7 @@ fn process_irq_character(b: u8) { }); println!("{} k total", total_bytes / 1024); } - #[cfg(feature = "gdbserver")] + #[cfg(all(feature = "gdbserver", baremetal))] b'g' => { println!("Starting GDB server -- attach your debugger now"); gdb_server::setup(); @@ -268,7 +268,7 @@ fn process_irq_character(b: u8) { println!("Xous Kernel Debug"); println!("key | command"); println!("--- + -----------------------"); - #[cfg(feature = "gdbserver")] + #[cfg(all(feature = "gdbserver", baremetal))] println!(" g | enter the gdb server"); println!(" m | print MMU page tables of all processes"); println!(" p | print all processes"); diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs index 4e51244a1..576d61f2e 100644 --- a/kernel/src/mem.rs +++ b/kernel/src/mem.rs @@ -107,7 +107,6 @@ impl MemoryManager { MEMORY_MANAGER.with(|ss| f(&mut ss.borrow_mut())) } - #[cfg(baremetal)] pub fn with(f: F) -> R where F: FnOnce(&MemoryManager) -> R, @@ -120,6 +119,7 @@ impl MemoryManager { #[cfg(not(baremetal))] MEMORY_MANAGER.with(|ss| f(&ss.borrow_mut())) } + #[cfg(baremetal)] pub fn init_from_memory( &mut self, @@ -177,9 +177,9 @@ impl MemoryManager { /// Print the number of RAM bytes used by the specified process. /// This does not include memory such as peripherals and CSRs. - #[cfg(baremetal)] pub fn ram_used_by(&self, pid: PID) -> usize { let mut owned_bytes = 0; + #[cfg(baremetal)] unsafe { for owner in &MEMORY_ALLOCATIONS[0..self.ram_size / PAGE_SIZE] { if owner == &Some(pid) { diff --git a/kernel/src/services.rs b/kernel/src/services.rs index c93074da2..c4606fd09 100644 --- a/kernel/src/services.rs +++ b/kernel/src/services.rs @@ -2135,4 +2135,9 @@ impl SystemServices { } None } + + #[cfg(not(baremetal))] + pub fn process_name(&self, pid: PID) -> Option<&str> { + None + } }