mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
xous: use try_into when converting messages to syscalls
This moves message internals back into the message struct. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
6cdd9b4b4c
commit
d3879d36ac
2 changed files with 65 additions and 54 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
use core::convert::TryInto;
|
use core::convert::{TryFrom, TryInto};
|
||||||
use core::num::{NonZeroU8, NonZeroUsize};
|
use core::num::{NonZeroU8, NonZeroUsize};
|
||||||
|
|
||||||
pub type MemoryAddress = NonZeroUsize;
|
pub type MemoryAddress = NonZeroUsize;
|
||||||
|
|
@ -393,7 +393,7 @@ impl Message {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn message_type(&self) -> usize {
|
pub(crate) fn message_type(&self) -> usize {
|
||||||
match *self {
|
match *self {
|
||||||
Message::MutableBorrow(_) => 1,
|
Message::MutableBorrow(_) => 1,
|
||||||
Message::Borrow(_) => 2,
|
Message::Borrow(_) => 2,
|
||||||
|
|
@ -402,6 +402,55 @@ impl Message {
|
||||||
Message::BlockingScalar(_) => 5,
|
Message::BlockingScalar(_) => 5,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Return the ID of this message
|
||||||
|
pub fn id(&self) -> usize {
|
||||||
|
match &self {
|
||||||
|
&Message::MutableBorrow(mem) | &Message::Borrow(mem) | &Message::Move(mem) => mem.id,
|
||||||
|
&Message::Scalar(s) | &Message::BlockingScalar(s) => s.id,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TryFrom<(usize, usize, usize, usize, usize, usize)> for Message {
|
||||||
|
type Error = ();
|
||||||
|
fn try_from(value: (usize, usize, usize, usize, usize, usize)) -> core::result::Result<Self, Self::Error> {
|
||||||
|
match value.0 {
|
||||||
|
1 => Ok(Message::MutableBorrow(MemoryMessage {
|
||||||
|
id: value.1,
|
||||||
|
buf: MemoryRange::new(value.2, value.3).map_err(|_| ())?,
|
||||||
|
offset: MemoryAddress::new(value.4),
|
||||||
|
valid: MemorySize::new(value.5),
|
||||||
|
})),
|
||||||
|
2 => Ok(Message::Borrow(MemoryMessage {
|
||||||
|
id: value.1,
|
||||||
|
buf: MemoryRange::new(value.2, value.3).map_err(|_| ())?,
|
||||||
|
offset: MemoryAddress::new(value.4),
|
||||||
|
valid: MemorySize::new(value.5),
|
||||||
|
})),
|
||||||
|
3 => Ok(Message::Move(MemoryMessage {
|
||||||
|
id: value.1,
|
||||||
|
buf: MemoryRange::new(value.2, value.3).map_err(|_| ())?,
|
||||||
|
offset: MemoryAddress::new(value.4),
|
||||||
|
valid: MemorySize::new(value.5),
|
||||||
|
})),
|
||||||
|
4 => Ok(Message::Scalar(ScalarMessage {
|
||||||
|
id: value.1,
|
||||||
|
arg1: value.2,
|
||||||
|
arg2: value.3,
|
||||||
|
arg3: value.4,
|
||||||
|
arg4: value.5,
|
||||||
|
})),
|
||||||
|
5 => Ok(Message::BlockingScalar(ScalarMessage {
|
||||||
|
id: value.1,
|
||||||
|
arg1: value.2,
|
||||||
|
arg2: value.3,
|
||||||
|
arg3: value.4,
|
||||||
|
arg4: value.5,
|
||||||
|
})),
|
||||||
|
_ => Err(()),
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
|
|
@ -600,7 +649,16 @@ impl Result {
|
||||||
Result::Scalar2(a, b) => [14, *a, *b, 0, 0, 0, 0, 0],
|
Result::Scalar2(a, b) => [14, *a, *b, 0, 0, 0, 0, 0],
|
||||||
Result::NewServerID(sid, cid) => {
|
Result::NewServerID(sid, cid) => {
|
||||||
let s = sid.to_u32();
|
let s = sid.to_u32();
|
||||||
[15, s.0 as _, s.1 as _, s.2 as _, s.3 as _, *cid as usize, 0, 0]
|
[
|
||||||
|
15,
|
||||||
|
s.0 as _,
|
||||||
|
s.1 as _,
|
||||||
|
s.2 as _,
|
||||||
|
s.3 as _,
|
||||||
|
*cid as usize,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
]
|
||||||
}
|
}
|
||||||
Result::WouldBlock => [16, 0, 0, 0, 0, 0, 0, 0],
|
Result::WouldBlock => [16, 0, 0, 0, 0, 0, 0, 0],
|
||||||
Result::None => [17, 0, 0, 0, 0, 0, 0, 0],
|
Result::None => [17, 0, 0, 0, 0, 0, 0, 0],
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ use crate::{
|
||||||
MemorySize, MemoryType, Message, MessageEnvelope, MessageSender, ProcessArgs, ProcessInit,
|
MemorySize, MemoryType, Message, MessageEnvelope, MessageSender, ProcessArgs, ProcessInit,
|
||||||
Result, ScalarMessage, SysCallResult, ThreadInit, CID, PID, SID, TID,
|
Result, ScalarMessage, SysCallResult, ThreadInit, CID, PID, SID, TID,
|
||||||
};
|
};
|
||||||
use core::convert::TryInto;
|
use core::convert::{TryInto, TryFrom};
|
||||||
|
|
||||||
// use num_derive::FromPrimitive;
|
// use num_derive::FromPrimitive;
|
||||||
// use num_traits::FromPrimitive;
|
// use num_traits::FromPrimitive;
|
||||||
|
|
@ -755,56 +755,9 @@ impl SysCall {
|
||||||
SysCallNumber::Connect => {
|
SysCallNumber::Connect => {
|
||||||
SysCall::Connect(SID::from_u32(a1 as _, a2 as _, a3 as _, a4 as _))
|
SysCall::Connect(SID::from_u32(a1 as _, a2 as _, a3 as _, a4 as _))
|
||||||
}
|
}
|
||||||
SysCallNumber::SendMessage => match a2 {
|
SysCallNumber::SendMessage => Message::try_from((a2, a3, a4, a5, a6, a7))
|
||||||
1 => SysCall::SendMessage(
|
.map(|m| SysCall::SendMessage(a1.try_into().unwrap(), m))
|
||||||
a1.try_into().unwrap(),
|
.unwrap_or_else(|_| SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7)),
|
||||||
Message::MutableBorrow(MemoryMessage {
|
|
||||||
id: a3,
|
|
||||||
buf: MemoryRange::new(a4, a5)?,
|
|
||||||
offset: MemoryAddress::new(a6),
|
|
||||||
valid: MemorySize::new(a7),
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
2 => SysCall::SendMessage(
|
|
||||||
a1.try_into().unwrap(),
|
|
||||||
Message::Borrow(MemoryMessage {
|
|
||||||
id: a3,
|
|
||||||
buf: MemoryRange::new(a4, a5)?,
|
|
||||||
offset: MemoryAddress::new(a6),
|
|
||||||
valid: MemorySize::new(a7),
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
3 => SysCall::SendMessage(
|
|
||||||
a1.try_into().unwrap(),
|
|
||||||
Message::Move(MemoryMessage {
|
|
||||||
id: a3,
|
|
||||||
buf: MemoryRange::new(a4, a5)?,
|
|
||||||
offset: MemoryAddress::new(a6),
|
|
||||||
valid: MemorySize::new(a7),
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
4 => SysCall::SendMessage(
|
|
||||||
a1.try_into().unwrap(),
|
|
||||||
Message::Scalar(ScalarMessage {
|
|
||||||
id: a3,
|
|
||||||
arg1: a4,
|
|
||||||
arg2: a5,
|
|
||||||
arg3: a6,
|
|
||||||
arg4: a7,
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
5 => SysCall::SendMessage(
|
|
||||||
a1.try_into().unwrap(),
|
|
||||||
Message::BlockingScalar(ScalarMessage {
|
|
||||||
id: a3,
|
|
||||||
arg1: a4,
|
|
||||||
arg2: a5,
|
|
||||||
arg3: a6,
|
|
||||||
arg4: a7,
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
_ => SysCall::Invalid(a1, a2, a3, a4, a5, a6, a7),
|
|
||||||
},
|
|
||||||
SysCallNumber::ReturnMemory => {
|
SysCallNumber::ReturnMemory => {
|
||||||
SysCall::ReturnMemory(MessageSender::from_usize(a1), MemoryRange::new(a2, a3)?)
|
SysCall::ReturnMemory(MessageSender::from_usize(a1), MemoryRange::new(a2, a3)?)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue