xous: make thread IDs u32

This keeps them consistent across platforms.

Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
Sean Cross 2021-02-01 17:18:24 +08:00
parent fb10311fbc
commit f98c8cc07c
3 changed files with 45 additions and 25 deletions

View file

@ -82,10 +82,28 @@ impl core::str::FromStr for SID {
}
}
/// Connection ID
pub type CID = usize;
impl From<[u32; 4]> for SID {
fn from(src: [u32; 4]) -> Self {
Self::from_u32(src[0], src[1], src[2], src[3])
}
}
/// Context ID
impl From<&[u32; 4]> for SID {
fn from(src: &[u32; 4]) -> Self {
Self::from_u32(src[0], src[1], src[2], src[3])
}
}
impl Into<[u32; 4]> for SID {
fn into(self) -> [u32; 4] {
[(self.0).0, (self.0).1, (self.0).2, (self.0).3]
}
}
/// Connection ID
pub type CID = u32;
/// Thread ID
pub type TID = usize;
/// Equivalent to a RISC-V Hart ID
@ -536,7 +554,7 @@ impl Result {
let s = sid.to_u32();
[6, s.0 as _, s.1 as _, s.2 as _, s.3 as _, 0, 0, 0]
}
Result::ConnectionID(cid) => [7, *cid, 0, 0, 0, 0, 0, 0],
Result::ConnectionID(cid) => [7, *cid as usize, 0, 0, 0, 0, 0, 0],
Result::Message(me) => {
let me_enc = me.to_usize();
[
@ -551,7 +569,7 @@ impl Result {
Result::Scalar2(a, b) => [14, *a, *b, 0, 0, 0, 0, 0],
Result::NewServerID(sid, cid) => {
let s = sid.to_u32();
[15, s.0 as _, s.1 as _, s.2 as _, s.3 as _, *cid, 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::None => [17, 0, 0, 0, 0, 0, 0, 0],

View file

@ -121,10 +121,10 @@ impl<T: Send> Sendable<T> {
/// Perform an immutable lend of this Carton to the specified server.
/// This function will block until the server returns.
pub fn lend(&self, connection: crate::CID, id: usize) -> Result<crate::Result, crate::Error> {
pub fn lend(&self, connection: crate::CID, id: u32) -> Result<crate::Result, crate::Error> {
let buf = crate::MemoryRange::new(self.contents as usize, self.total_size)?;
let msg = crate::MemoryMessage {
id,
id: id as usize,
buf,
offset: None,
valid: crate::MemorySize::new(core::mem::size_of::<T>()),
@ -136,11 +136,11 @@ impl<T: Send> Sendable<T> {
pub fn lend_mut(
&mut self,
connection: crate::CID,
id: usize,
id: u32,
) -> Result<crate::Result, crate::Error> {
let buf = crate::MemoryRange::new(self.contents as usize, self.total_size)?;
let msg = crate::MemoryMessage {
id,
id: id as usize,
buf,
offset: None,
valid: crate::MemorySize::new(core::mem::size_of::<T>()),
@ -155,11 +155,11 @@ impl<T: Send> Sendable<T> {
pub fn send(
mut self,
connection: crate::CID,
id: usize,
id: u32,
) -> Result<crate::Result, crate::Error> {
let buf = crate::MemoryRange::new(self.contents as usize, self.total_size)?;
let msg = crate::MemoryMessage {
id,
id: id as usize,
buf,
offset: None,
valid: crate::MemorySize::new(core::mem::size_of::<T>()),

View file

@ -3,6 +3,8 @@ use crate::{
MemorySize, MemoryType, Message, MessageEnvelope, MessageSender, ProcessArgs, ProcessInit,
Result, ScalarMessage, SysCallResult, ThreadInit, CID, PID, SID,
};
use core::convert::TryInto;
// use num_derive::FromPrimitive;
// use num_traits::FromPrimitive;
@ -565,7 +567,7 @@ impl SysCall {
SysCall::SendMessage(a1, ref a2) => match a2 {
Message::MutableBorrow(mm) | Message::Borrow(mm) | Message::Move(mm) => [
SysCallNumber::SendMessage as usize,
*a1,
*a1 as usize,
a2.message_type(),
mm.id as usize,
mm.buf.as_ptr() as usize,
@ -575,7 +577,7 @@ impl SysCall {
],
Message::Scalar(sc) | Message::BlockingScalar(sc) => [
SysCallNumber::SendMessage as usize,
*a1,
*a1 as usize,
a2.message_type(),
sc.id as usize,
sc.arg1,
@ -627,7 +629,7 @@ impl SysCall {
SysCall::TrySendMessage(a1, ref a2) => match a2 {
Message::MutableBorrow(mm) | Message::Borrow(mm) | Message::Move(mm) => [
SysCallNumber::TrySendMessage as usize,
*a1,
*a1 as usize,
a2.message_type(),
mm.id as usize,
mm.buf.as_ptr() as usize,
@ -637,7 +639,7 @@ impl SysCall {
],
Message::Scalar(sc) | Message::BlockingScalar(sc) => [
SysCallNumber::TrySendMessage as usize,
*a1,
*a1 as usize,
a2.message_type(),
sc.id as usize,
sc.arg1,
@ -742,7 +744,7 @@ impl SysCall {
}
SysCallNumber::SendMessage => match a2 {
1 => SysCall::SendMessage(
a1,
a1.try_into().unwrap(),
Message::MutableBorrow(MemoryMessage {
id: a3,
buf: MemoryRange::new(a4, a5)?,
@ -751,7 +753,7 @@ impl SysCall {
}),
),
2 => SysCall::SendMessage(
a1,
a1.try_into().unwrap(),
Message::Borrow(MemoryMessage {
id: a3,
buf: MemoryRange::new(a4, a5)?,
@ -760,7 +762,7 @@ impl SysCall {
}),
),
3 => SysCall::SendMessage(
a1,
a1.try_into().unwrap(),
Message::Move(MemoryMessage {
id: a3,
buf: MemoryRange::new(a4, a5)?,
@ -769,7 +771,7 @@ impl SysCall {
}),
),
4 => SysCall::SendMessage(
a1,
a1.try_into().unwrap(),
Message::Scalar(ScalarMessage {
id: a3,
arg1: a4,
@ -779,7 +781,7 @@ impl SysCall {
}),
),
5 => SysCall::SendMessage(
a1,
a1.try_into().unwrap(),
Message::BlockingScalar(ScalarMessage {
id: a3,
arg1: a4,
@ -806,7 +808,7 @@ impl SysCall {
}
SysCallNumber::TrySendMessage => match a2 {
1 => SysCall::TrySendMessage(
a1,
a1 as u32,
Message::MutableBorrow(MemoryMessage {
id: a3,
buf: MemoryRange::new(a4, a5)?,
@ -815,7 +817,7 @@ impl SysCall {
}),
),
2 => SysCall::TrySendMessage(
a1,
a1 as u32,
Message::Borrow(MemoryMessage {
id: a3,
buf: MemoryRange::new(a4, a5)?,
@ -824,7 +826,7 @@ impl SysCall {
}),
),
3 => SysCall::TrySendMessage(
a1,
a1 as u32,
Message::Move(MemoryMessage {
id: a3,
buf: MemoryRange::new(a4, a5)?,
@ -833,7 +835,7 @@ impl SysCall {
}),
),
4 => SysCall::TrySendMessage(
a1,
a1 as u32,
Message::Scalar(ScalarMessage {
id: a3,
arg1: a4,
@ -843,7 +845,7 @@ impl SysCall {
}),
),
5 => SysCall::TrySendMessage(
a1,
a1.try_into().unwrap(),
Message::BlockingScalar(ScalarMessage {
id: a3,
arg1: a4,