From 673577a10e36c11e6d30ba3fb13e66c67b518b19 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 22 Sep 2020 21:33:09 +0800 Subject: [PATCH] xous: syscall: add BlockingScalar to syscall handling Signed-off-by: Sean Cross --- xous-rs/Cargo.toml | 2 +- xous-rs/src/arch/hosted.rs | 29 +++++--------------- xous-rs/src/definitions.rs | 10 +++++++ xous-rs/src/syscall.rs | 56 ++++++-------------------------------- 4 files changed, 26 insertions(+), 71 deletions(-) diff --git a/xous-rs/Cargo.toml b/xous-rs/Cargo.toml index 16e130262..e5caa1589 100644 --- a/xous-rs/Cargo.toml +++ b/xous-rs/Cargo.toml @@ -19,7 +19,7 @@ forget-memory-messages = [] # so you can run log commands such as `info!()`. logging = ["log"] -default = ["logging"] +default = [] [target.'cfg(any(windows,unix))'.dependencies] lazy_static = "1.4" diff --git a/xous-rs/src/arch/hosted.rs b/xous-rs/src/arch/hosted.rs index 818e1cff7..2788045d1 100644 --- a/xous-rs/src/arch/hosted.rs +++ b/xous-rs/src/arch/hosted.rs @@ -567,9 +567,9 @@ fn _xous_syscall_result( // it gets converted into a MemoryMessage. Now that the call is // complete, free the memory. mem::unmap_memory_post(*buf).unwrap(); - }, + } // Nothing to do for Immutable borrow, since the memory can't change - crate::Message::Scalar(_) => (), + crate::Message::Scalar(_) | crate::Message::BlockingScalar(_) => (), } } _ => (), @@ -620,30 +620,15 @@ fn _xous_syscall_to( match call { crate::SysCall::SendMessage(_, ref msg) | crate::SysCall::TrySendMessage(_, ref msg) => { match msg { - crate::Message::MutableBorrow(crate::MemoryMessage { - id: _id, - buf, - offset: _offset, - valid: _valid, - }) - | crate::Message::Borrow(crate::MemoryMessage { - id: _id, - buf, - offset: _offset, - valid: _valid, - }) - | crate::Message::Move(crate::MemoryMessage { - id: _id, - buf, - offset: _offset, - valid: _valid, - }) => { + crate::Message::MutableBorrow(m) + | crate::Message::Borrow(m) + | crate::Message::Move(m) => { use core::slice; let data: &[u8] = - unsafe { slice::from_raw_parts(buf.addr.get() as _, buf.size.get()) }; + unsafe { slice::from_raw_parts(m.buf.addr.get() as _, m.buf.size.get()) }; pkt.extend_from_slice(data); } - crate::Message::Scalar(_) => (), + crate::Message::Scalar(_) | crate::Message::BlockingScalar(_) => (), } } _ => (), diff --git a/xous-rs/src/definitions.rs b/xous-rs/src/definitions.rs index 67126e513..e7962a430 100644 --- a/xous-rs/src/definitions.rs +++ b/xous-rs/src/definitions.rs @@ -305,6 +305,16 @@ impl Message { Message::BlockingScalar(_) | Message::Scalar(_) => false, } } + + pub fn message_type(&self) -> usize { + match *self { + Message::MutableBorrow(_) => 1, + Message::Borrow(_) => 2, + Message::Move(_) => 3, + Message::Scalar(_) => 4, + Message::BlockingScalar(_) => 5, + } + } } #[repr(C)] diff --git a/xous-rs/src/syscall.rs b/xous-rs/src/syscall.rs index 452405746..e134d1490 100644 --- a/xous-rs/src/syscall.rs +++ b/xous-rs/src/syscall.rs @@ -487,40 +487,20 @@ impl SysCall { ] } SysCall::SendMessage(a1, ref a2) => match a2 { - Message::MutableBorrow(mm) => [ + Message::MutableBorrow(mm) | Message::Borrow(mm) | Message::Move(mm) => [ SysCallNumber::SendMessage as usize, *a1, - 1, + a2.message_type(), mm.id as usize, mm.buf.as_ptr() as usize, mm.buf.len(), mm.offset.map(|x| x.get()).unwrap_or(0) as usize, mm.valid.map(|x| x.get()).unwrap_or(0) as usize, ], - Message::Borrow(mm) => [ + Message::Scalar(sc) | Message::BlockingScalar(sc) => [ SysCallNumber::SendMessage as usize, *a1, - 2, - mm.id as usize, - mm.buf.as_ptr() as usize, - mm.buf.len(), - mm.offset.map(|x| x.get()).unwrap_or(0) as usize, - mm.valid.map(|x| x.get()).unwrap_or(0) as usize, - ], - Message::Move(mm) => [ - SysCallNumber::SendMessage as usize, - *a1, - 3, - mm.id as usize, - mm.buf.as_ptr() as usize, - mm.buf.len(), - mm.offset.map(|x| x.get()).unwrap_or(0) as usize, - mm.valid.map(|x| x.get()).unwrap_or(0) as usize, - ], - Message::Scalar(sc) => [ - SysCallNumber::SendMessage as usize, - *a1, - 4, + a2.message_type(), sc.id as usize, sc.arg1, sc.arg2, @@ -569,40 +549,20 @@ impl SysCall { ] } SysCall::TrySendMessage(a1, ref a2) => match a2 { - Message::MutableBorrow(mm) => [ + Message::MutableBorrow(mm) | Message::Borrow(mm) | Message::Move(mm) => [ SysCallNumber::TrySendMessage as usize, *a1, - 1, + a2.message_type(), mm.id as usize, mm.buf.as_ptr() as usize, mm.buf.len(), mm.offset.map(|x| x.get()).unwrap_or(0) as usize, mm.valid.map(|x| x.get()).unwrap_or(0) as usize, ], - Message::Borrow(mm) => [ + Message::Scalar(sc) | Message::BlockingScalar(sc) => [ SysCallNumber::TrySendMessage as usize, *a1, - 2, - mm.id as usize, - mm.buf.as_ptr() as usize, - mm.buf.len(), - mm.offset.map(|x| x.get()).unwrap_or(0) as usize, - mm.valid.map(|x| x.get()).unwrap_or(0) as usize, - ], - Message::Move(mm) => [ - SysCallNumber::TrySendMessage as usize, - *a1, - 3, - mm.id as usize, - mm.buf.as_ptr() as usize, - mm.buf.len(), - mm.offset.map(|x| x.get()).unwrap_or(0) as usize, - mm.valid.map(|x| x.get()).unwrap_or(0) as usize, - ], - Message::Scalar(sc) => [ - SysCallNumber::TrySendMessage as usize, - *a1, - 4, + a2.message_type(), sc.id as usize, sc.arg1, sc.arg2,