examples: add log strings

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2020-03-31 18:37:40 +08:00
parent a947d7fd79
commit 94459c8d43
2 changed files with 97 additions and 0 deletions

View file

@ -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");
}
}

View file

@ -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<xous::MemoryMessage, xous::Error> {
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(())
}
}