From 94459c8d43c3e581f6a5f56034ec97293168ed94 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 31 Mar 2020 18:37:40 +0800 Subject: [PATCH] examples: add log strings Signed-off-by: Sean Cross --- examples/log/src/log_string.rs | 45 +++++++++++++++++++++++++++++ examples/shell/src/logstr.rs | 52 ++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 examples/log/src/log_string.rs create mode 100644 examples/shell/src/logstr.rs diff --git a/examples/log/src/log_string.rs b/examples/log/src/log_string.rs new file mode 100644 index 000000000..66d5e19f7 --- /dev/null +++ b/examples/log/src/log_string.rs @@ -0,0 +1,45 @@ +use core::fmt; +use core::slice; +use xous; + +pub struct LogString<'a> { + backing: &'a [u8], + s: &'a str, +} + +impl<'a> LogString<'a> { + pub fn from_message(message: xous::MemoryMessage) -> LogString<'a> { + println!( + "Message address is at {:08x}", + message.buf.expect("no buffer").get() + ); + LogString { + backing: unsafe { + slice::from_raw_parts( + message.buf.expect("no buffer present").get() as *mut u8, + message.buf_size.expect("no buffer length present").get(), + ) + }, + s: unsafe { + core::str::from_utf8(slice::from_raw_parts( + message.buf.expect("no buffer present").get() as *mut u8, + message.valid.expect("no buffer length present").get(), + )) + .expect("message didn't have valid utf8") + }, + } + } +} + +impl<'a> fmt::Display for LogString<'a> { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "{}", self.s) + } +} + +impl<'a> Drop for LogString<'a> { + fn drop(&mut self) { + xous::syscall::unmap_memory(xous::MemoryAddress::new(self.backing.as_ptr() as usize).unwrap(), self.backing.len()) + .expect("couldn't free string"); + } +} diff --git a/examples/shell/src/logstr.rs b/examples/shell/src/logstr.rs new file mode 100644 index 000000000..fb697f46d --- /dev/null +++ b/examples/shell/src/logstr.rs @@ -0,0 +1,52 @@ +use core::fmt::{Error, Write}; +use core::slice; +use xous; + +pub struct LogStr<'a> { + raw_slice: &'a mut [u8], + len: usize, + string: &'a str, +} + +impl<'a> LogStr<'a> { + pub fn new() -> LogStr<'a> { + let mem = xous::syscall::map_memory( + None, + None, + 4096, + xous::MemoryFlags::R | xous::MemoryFlags::W, + ) + .expect("couldn't allocate memory"); + + let raw_slice = unsafe { slice::from_raw_parts_mut(mem.base, 4096) }; + + LogStr { + raw_slice, + len: 0, + string: unsafe { + core::str::from_utf8_unchecked(slice::from_raw_parts(mem.base, 0)) + }, + } + } + + pub fn into_memory_message(self, id: xous::MessageId) -> Result { + Ok(xous::MemoryMessage { + id: id, + buf: xous::MemoryAddress::new(self.raw_slice.as_ptr() as usize), + buf_size: xous::MemorySize::new(self.raw_slice.len()), + offset: None, + valid: xous::MemorySize::new(self.len), + }) + } +} + +impl<'a> Write for LogStr<'a> { + fn write_str(&mut self, s: &str) -> Result<(), Error> { + for c in s.bytes() { + self.raw_slice[self.len] = c; + self.len += 1; + } + self.string = unsafe { core::str::from_utf8_unchecked(slice::from_raw_parts(self.raw_slice.as_ptr(), self.len)) }; + Ok(()) + } +}