From 0ffbaa369a11498b9e1fd8bd4ac3926142a2bea0 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 14 Jul 2020 15:16:51 +0800 Subject: [PATCH] kernel: fix remaining warnings This just silences them, which isn't great in the long run. Signed-off-by: Sean Cross --- kernel/src/arch/hosted/process.rs | 1 + kernel/src/arch/hosted/syscall.rs | 2 ++ kernel/src/args.rs | 2 ++ kernel/src/mem.rs | 3 +++ kernel/src/test/mod.rs | 5 ++++- xous-rs/src/hosted/mod.rs | 1 - xous-rs/src/messages/mod.rs | 2 -- xous-rs/src/messages/stringmessage.rs | 24 ------------------------ 8 files changed, 12 insertions(+), 28 deletions(-) delete mode 100644 xous-rs/src/messages/stringmessage.rs diff --git a/kernel/src/arch/hosted/process.rs b/kernel/src/arch/hosted/process.rs index 93f1fb073..2eacfebd1 100644 --- a/kernel/src/arch/hosted/process.rs +++ b/kernel/src/arch/hosted/process.rs @@ -131,6 +131,7 @@ impl Process { Ok(()) } + #[allow(dead_code)] pub fn find_free_context_nr(&self) -> Option { None } diff --git a/kernel/src/arch/hosted/syscall.rs b/kernel/src/arch/hosted/syscall.rs index 44f558719..05dad80e4 100644 --- a/kernel/src/arch/hosted/syscall.rs +++ b/kernel/src/arch/hosted/syscall.rs @@ -1,4 +1,5 @@ use super::process::Context; +#[allow(dead_code)] pub fn invoke( _context: &mut Context, _supervisor: bool, @@ -7,4 +8,5 @@ pub fn invoke( _ret_addr: usize, _args: &[usize], ) { + unimplemented!() } diff --git a/kernel/src/args.rs b/kernel/src/args.rs index be669d085..dcbc81bbf 100644 --- a/kernel/src/args.rs +++ b/kernel/src/args.rs @@ -23,10 +23,12 @@ pub struct KernelArgumentsIterator { } impl KernelArguments { + #[allow(dead_code)] pub fn get() -> Self { KernelArguments { base: unsafe { KERNEL_ARGUMENTS_BASE } } } + #[allow(dead_code)] pub unsafe fn init(base: *const u32) { KERNEL_ARGUMENTS_BASE = base; } diff --git a/kernel/src/mem.rs b/kernel/src/mem.rs index 130b8f845..1e7488249 100644 --- a/kernel/src/mem.rs +++ b/kernel/src/mem.rs @@ -457,6 +457,7 @@ impl MemoryManager { } /// Move a page from one process into another, keeping its permissions. + #[allow(dead_code)] pub fn move_page( &mut self, src_mapping: &MemoryMapping, @@ -479,6 +480,7 @@ impl MemoryManager { /// read-only, then additionally remove the "write" bit on it. If the page /// is writable, then remove it from the current process until the borrow is /// returned. + #[allow(dead_code)] pub fn lend_page( &mut self, src_mapping: &MemoryMapping, @@ -503,6 +505,7 @@ impl MemoryManager { } /// Return the range from `src_mapping` back to `dest_mapping` + #[allow(dead_code)] pub fn unlend_page( &mut self, src_mapping: &MemoryMapping, diff --git a/kernel/src/test/mod.rs b/kernel/src/test/mod.rs index d4ea422a3..eb021431b 100644 --- a/kernel/src/test/mod.rs +++ b/kernel/src/test/mod.rs @@ -124,6 +124,8 @@ fn send_scalar_message() { #[test] fn send_move_message() { let server_spec = "localhost:0"; + let test_str = "Hello, world!"; + let test_bytes = test_str.as_bytes(); let (main_thread, server_spec) = start_kernel(server_spec); @@ -141,6 +143,7 @@ fn send_move_message() { let bt = unsafe { Box::from_raw(core::slice::from_raw_parts_mut(buf.as_mut_ptr(), buf.len())) }; + assert_eq!(*test_bytes, *bt); // let s = String::from_utf8_lossy(&bt); // println!("Got message: {:?} -> \"{}\"", bt, s); } else { @@ -156,7 +159,7 @@ fn send_move_message() { let sid = server_addr_recv.recv().unwrap(); // println!("CLIENT: Connecting to server {:?}", sid); let conn = xous::connect(sid).expect("couldn't connect to server"); - let msg = xous::carton::Carton::from_bytes(format!("Hello, world!").as_bytes()); + let msg = xous::carton::Carton::from_bytes(test_bytes); xous::send_message(conn, xous::Message::Move(msg.into_message(0))) .expect("couldn't send a message"); }); diff --git a/xous-rs/src/hosted/mod.rs b/xous-rs/src/hosted/mod.rs index e104436e6..a91952c43 100644 --- a/xous-rs/src/hosted/mod.rs +++ b/xous-rs/src/hosted/mod.rs @@ -181,7 +181,6 @@ fn _xous_syscall_to( } }*/ // Nothing to do for Immutable borrow, since the memory can't change - crate::Message::Borrow(_) => (), crate::Message::Scalar(_) => (), } } diff --git a/xous-rs/src/messages/mod.rs b/xous-rs/src/messages/mod.rs index 19c09cda3..e69de29bb 100644 --- a/xous-rs/src/messages/mod.rs +++ b/xous-rs/src/messages/mod.rs @@ -1,2 +0,0 @@ -pub mod stringmessage; -pub use stringmessage::StringMessage; diff --git a/xous-rs/src/messages/stringmessage.rs b/xous-rs/src/messages/stringmessage.rs deleted file mode 100644 index 38cbfa0b1..000000000 --- a/xous-rs/src/messages/stringmessage.rs +++ /dev/null @@ -1,24 +0,0 @@ -use crate::{MemoryMessage, MemoryRange}; - -pub struct StringMessage { - backing: *mut u8, - length: usize, -} - -impl StringMessage { - pub fn new(src: &str) -> Self { - StringMessage { - backing: 0 as _, - length: 0 - } - } - - pub fn into_message(self, id: usize) -> MemoryMessage { - MemoryMessage { - id, - buf: MemoryRange::new(self.backing as _, self.length), - offset: None, - valid: None, - } - } -}