From d8edcb8b9e8cc91677a4da1429f554560b8ae309 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Tue, 22 Sep 2020 23:36:11 +0800 Subject: [PATCH] xous: implement ReturnScalar and ReturnScalar2 Signed-off-by: Sean Cross --- xous-rs/src/carton.rs | 4 ++-- xous-rs/src/syscall.rs | 43 ++++++++++++++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 10 deletions(-) diff --git a/xous-rs/src/carton.rs b/xous-rs/src/carton.rs index 7d2b2696c..11be6e162 100644 --- a/xous-rs/src/carton.rs +++ b/xous-rs/src/carton.rs @@ -55,7 +55,7 @@ impl<'a> Carton<'a> { /// Perform an immutable lend of this Carton to the specified server. /// This function will block until the server returns. - pub fn lend(&self, connection: CID, id: usize) -> Result<(), Error> { + pub fn lend(&self, connection: CID, id: usize) -> Result { let msg = MemoryMessage { id, buf: self.valid, @@ -66,7 +66,7 @@ impl<'a> Carton<'a> { } /// Perform a mutable lend of this Carton to the server. - pub fn lend_mut(&mut self, connection: CID, id: usize) -> Result<(), Error> { + pub fn lend_mut(&mut self, connection: CID, id: usize) -> Result { let msg = MemoryMessage { id, buf: self.valid, diff --git a/xous-rs/src/syscall.rs b/xous-rs/src/syscall.rs index 6ea16bf21..92deefd4d 100644 --- a/xous-rs/src/syscall.rs +++ b/xous-rs/src/syscall.rs @@ -246,9 +246,15 @@ pub enum SysCall { /// Try to send a message to a server TrySendMessage(CID, Message), - /// Return a Borrowed memory region to a sender + /// Return a Borrowed memory region to the sender ReturnMemory(MessageSender, MemoryRange), + /// Return a scalar to the sender + ReturnScalar1(MessageSender, usize), + + /// Return two scalars to the sender + ReturnScalar2(MessageSender, usize, usize), + /// Spawn a new thread CreateThread(ThreadInit), @@ -293,6 +299,8 @@ pub enum SysCallNumber { Shutdown = 23, TrySendMessage = 24, TryConnect = 25, + ReturnScalar1 = 26, + ReturnScalar2 = 27, Invalid, } @@ -324,6 +332,8 @@ impl SysCallNumber { 23 => Shutdown, 24 => TrySendMessage, 25 => TryConnect, + 26 => ReturnScalar1, + 27 => ReturnScalar2, _ => Invalid, } } @@ -570,6 +580,8 @@ impl SysCall { sc.arg4, ], }, + SysCall::ReturnScalar1(sender, arg1) => [SysCallNumber::ReturnScalar1 as usize, *sender, *arg1, 0, 0, 0, 0, 0], + SysCall::ReturnScalar2(sender, arg1, arg2) => [SysCallNumber::ReturnScalar2 as usize, *sender, *arg1, *arg2, 0, 0, 0, 0], SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7) => [ SysCallNumber::Invalid as usize, *a1, @@ -752,6 +764,8 @@ impl SysCall { ), _ => SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7), }, + SysCallNumber::ReturnScalar1 => SysCall::ReturnScalar1(a1, a2), + SysCallNumber::ReturnScalar2 => SysCall::ReturnScalar2(a1, a2, a3), SysCallNumber::Invalid => SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7), }) } @@ -836,6 +850,19 @@ pub fn return_memory(sender: MessageSender, mem: MemoryRange) -> core::result::R } } +/// Map the given physical address to the given virtual address. +/// The `size` field must be page-aligned. +pub fn return_scalar(sender: MessageSender, val: usize) -> core::result::Result<(), Error> { + let result = rsyscall(SysCall::ReturnScalar1(sender, val))?; + if let crate::Result::Ok = result { + Ok(()) + } else if let Result::Error(e) = result { + Err(e) + } else { + Err(Error::InternalError) + } +} + /// Claim a hardware interrupt for this process. pub fn claim_interrupt( irq_no: usize, @@ -930,14 +957,14 @@ pub fn receive_message(server: SID) -> core::result::Result core::result::Result<(), Error> { +pub fn try_send_message(connection: CID, message: Message) -> core::result::Result { let result = rsyscall(SysCall::TrySendMessage(connection, message)); - if let Ok(Result::Ok) = result { - Ok(()) - } else if let Err(e) = result { - Err(e) - } else { - panic!("Unexpected return value: {:?}", result); + match result { + Ok(Result::Ok) => Ok(Result::Ok), + Ok(Result::Scalar1(a)) => Ok(Result::Scalar1(a)), + Ok(Result::Scalar2(a, b)) => Ok(Result::Scalar2(a, b)), + Err(e) => Err(e), + v => panic!("Unexpected return value: {:?}", v), } }