From 1fa83d1d94c52687f641fa0e89e4b416fb03ab89 Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Fri, 4 Dec 2020 22:16:24 +0800 Subject: [PATCH] xous: make MessageSender a struct This is now an object instead of an alias for `usize`, in preparation for adding a `.pid()` function. Signed-off-by: Sean Cross --- kernel/src/arch/hosted.rs | 2 +- kernel/src/server.rs | 14 +++++++++++++- xous-rs/src/definitions.rs | 31 ++++++++++++++++++++++++++++--- xous-rs/src/syscall.rs | 18 ++++++++++++------ 4 files changed, 54 insertions(+), 11 deletions(-) diff --git a/kernel/src/arch/hosted.rs b/kernel/src/arch/hosted.rs index 947c46dae..e6a46be1e 100644 --- a/kernel/src/arch/hosted.rs +++ b/kernel/src/arch/hosted.rs @@ -237,7 +237,7 @@ fn handle_connection( | xous_kernel::Message::BlockingScalar(_) => (), } } - SysCall::ReturnMemory(_sender, ref mut buf) => { + SysCall::ReturnMemory(ref _sender, ref mut buf) => { let sliced_data = data.into_boxed_slice(); assert_eq!( sliced_data.len(), diff --git a/kernel/src/server.rs b/kernel/src/server.rs index d85940621..93fc5cf23 100644 --- a/kernel/src/server.rs +++ b/kernel/src/server.rs @@ -1,6 +1,6 @@ pub use crate::arch::process::Thread; use core::mem; -use xous_kernel::{MemoryAddress, MemoryRange, MemorySize, Message, PID, SID, TID}; +use xous_kernel::{MemoryAddress, MemoryRange, MemorySize, Message, MessageSender, PID, SID, TID}; pub struct SenderID { /// The index of the server within the SystemServices table @@ -24,6 +24,18 @@ impl Into for SenderID { } } +impl From for SenderID { + fn from(item: MessageSender) -> SenderID { + SenderID::from(item.to_usize()) + } +} + +impl Into for SenderID { + fn into(self) -> MessageSender { + MessageSender::from_usize(self.into()) + } +} + #[derive(Debug)] pub enum WaitingMessage { /// There is no waiting message. diff --git a/xous-rs/src/definitions.rs b/xous-rs/src/definitions.rs index d3796c65b..5c932511d 100644 --- a/xous-rs/src/definitions.rs +++ b/xous-rs/src/definitions.rs @@ -7,9 +7,34 @@ pub type StackPointer = usize; pub type MessageId = usize; pub type PID = NonZeroU8; -pub type MessageSender = usize; pub type Connection = usize; +#[derive(Debug, PartialEq, Eq, Ord, PartialOrd, Copy, Clone)] +pub struct MessageSender { + data: usize, +} + +impl MessageSender { + pub fn to_usize(&self) -> usize { + self.data + } + pub fn from_usize(data: usize) -> Self { + MessageSender { data } + } +} + +impl core::default::Default for MessageSender { + fn default() -> Self { + MessageSender { data: 0 } + } +} + +impl core::fmt::Display for MessageSender { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + write!(f, "data: {}", self.data) + } +} + /// Server ID #[derive(Debug, Copy, Clone, PartialEq)] pub struct SID((u32, u32, u32, u32)); @@ -343,7 +368,7 @@ impl MessageEnvelope { Message::BlockingScalar(m) => (4, m.to_usize()), }; [ - self.sender, + self.sender.to_usize(), ret.0, ret.1[0], ret.1[1], @@ -574,7 +599,7 @@ impl Result { _ => return Result::Error(Error::InternalError), }; Result::Message(MessageEnvelope { - sender, + sender: MessageSender::from_usize(sender), body: message, }) } diff --git a/xous-rs/src/syscall.rs b/xous-rs/src/syscall.rs index 363e4c6f2..ae1de5f55 100644 --- a/xous-rs/src/syscall.rs +++ b/xous-rs/src/syscall.rs @@ -558,7 +558,7 @@ impl SysCall { }, SysCall::ReturnMemory(sender, buf) => [ SysCallNumber::ReturnMemory as usize, - *sender, + sender.to_usize(), buf.as_ptr() as usize, buf.len(), 0, @@ -620,7 +620,7 @@ impl SysCall { }, SysCall::ReturnScalar1(sender, arg1) => [ SysCallNumber::ReturnScalar1 as usize, - *sender, + sender.to_usize(), *arg1, 0, 0, @@ -630,7 +630,7 @@ impl SysCall { ], SysCall::ReturnScalar2(sender, arg1, arg2) => [ SysCallNumber::ReturnScalar2 as usize, - *sender, + sender.to_usize(), *arg1, *arg2, 0, @@ -762,7 +762,9 @@ impl SysCall { ), _ => SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7), }, - SysCallNumber::ReturnMemory => SysCall::ReturnMemory(a1, MemoryRange::new(a2, a3)?), + SysCallNumber::ReturnMemory => { + SysCall::ReturnMemory(MessageSender::from_usize(a1), MemoryRange::new(a2, a3)?) + } SysCallNumber::CreateThread => { SysCall::CreateThread(crate::arch::args_to_thread(a1, a2, a3, a4, a5, a6, a7)?) } @@ -824,8 +826,12 @@ 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::ReturnScalar1 => { + SysCall::ReturnScalar1(MessageSender::from_usize(a1), a2) + } + SysCallNumber::ReturnScalar2 => { + SysCall::ReturnScalar2(MessageSender::from_usize(a1), a2, a3) + } SysCallNumber::Invalid => SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7), }) }