From 6c9cc968f6e4cf5a5fb51bba178b0050a87f1f3d Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Fri, 1 Dec 2023 11:33:30 +0100 Subject: [PATCH] xous-rs: Remove usize castings when not necessary. --- xous-rs/src/definitions.rs | 2 +- xous-rs/src/syscall.rs | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/xous-rs/src/definitions.rs b/xous-rs/src/definitions.rs index d7da743c5..6b90c2301 100644 --- a/xous-rs/src/definitions.rs +++ b/xous-rs/src/definitions.rs @@ -425,7 +425,7 @@ impl Result { 9, me_enc[0], me_enc[1], me_enc[2], me_enc[3], me_enc[4], me_enc[5], me_enc[6], ] } - Result::ThreadID(ctx) => [10, *ctx as usize, 0, 0, 0, 0, 0, 0], + Result::ThreadID(ctx) => [10, *ctx, 0, 0, 0, 0, 0, 0], Result::ProcessID(pid) => [11, pid.get() as _, 0, 0, 0, 0, 0, 0], Result::Unimplemented => [21, 0, 0, 0, 0, 0, 0, 0], Result::BlockedProcess => [13, 0, 0, 0, 0, 0, 0, 0], diff --git a/xous-rs/src/syscall.rs b/xous-rs/src/syscall.rs index d0b6f290b..576bc7348 100644 --- a/xous-rs/src/syscall.rs +++ b/xous-rs/src/syscall.rs @@ -728,7 +728,7 @@ impl SysCall { SysCall::ReturnToParent(a1, a2) => [ SysCallNumber::ReturnToParent as usize, a1.get() as usize, - *a2 as usize, + *a2, 0, 0, 0, @@ -751,7 +751,7 @@ impl SysCall { SysCall::SwitchTo(a1, a2) => [ SysCallNumber::SwitchTo as usize, a1.get() as usize, - *a2 as usize, + *a2, 0, 0, 0, @@ -770,7 +770,7 @@ impl SysCall { ], SysCall::IncreaseHeap(a1, a2) => [ SysCallNumber::IncreaseHeap as usize, - *a1 as usize, + *a1, a2.bits(), 0, 0, @@ -780,7 +780,7 @@ impl SysCall { ], SysCall::DecreaseHeap(a1) => [ SysCallNumber::DecreaseHeap as usize, - *a1 as usize, + *a1, 0, 0, 0, @@ -841,17 +841,17 @@ impl SysCall { SysCallNumber::SendMessage as usize, *a1 as usize, a2.message_type(), - mm.id as usize, + mm.id, 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, + mm.offset.map(|x| x.get()).unwrap_or(0), + mm.valid.map(|x| x.get()).unwrap_or(0), ], Message::Scalar(sc) | Message::BlockingScalar(sc) => [ SysCallNumber::SendMessage as usize, *a1 as usize, a2.message_type(), - sc.id as usize, + sc.id, sc.arg1, sc.arg2, sc.arg3, @@ -914,17 +914,17 @@ impl SysCall { SysCallNumber::TrySendMessage as usize, *a1 as usize, a2.message_type(), - mm.id as usize, + mm.id, 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, + mm.offset.map(|x| x.get()).unwrap_or(0), + mm.valid.map(|x| x.get()).unwrap_or(0), ], Message::Scalar(sc) | Message::BlockingScalar(sc) => [ SysCallNumber::TrySendMessage as usize, *a1 as usize, a2.message_type(), - sc.id as usize, + sc.id, sc.arg1, sc.arg2, sc.arg3, @@ -978,7 +978,7 @@ impl SysCall { ], SysCall::JoinThread(tid) => [ SysCallNumber::JoinThread as usize, - *tid as usize, + *tid, 0, 0, 0, @@ -1073,13 +1073,13 @@ impl SysCall { MemoryAddress::new(a3), ), SysCallNumber::FreeInterrupt => SysCall::FreeInterrupt(a1), - SysCallNumber::SwitchTo => SysCall::SwitchTo(pid_from_usize(a1)?, a2 as usize), + SysCallNumber::SwitchTo => SysCall::SwitchTo(pid_from_usize(a1)?, a2), SysCallNumber::ReadyThreads => SysCall::ReadyThreads(pid_from_usize(a1)?), SysCallNumber::IncreaseHeap => SysCall::IncreaseHeap( - a1 as usize, + a1, crate::MemoryFlags::from_bits(a2).ok_or(Error::InvalidSyscall)?, ), - SysCallNumber::DecreaseHeap => SysCall::DecreaseHeap(a1 as usize), + SysCallNumber::DecreaseHeap => SysCall::DecreaseHeap(a1), SysCallNumber::UpdateMemoryFlags => SysCall::UpdateMemoryFlags( unsafe { MemoryRange::new(a1, a2) }?, crate::MemoryFlags::from_bits(a3).ok_or(Error::InvalidSyscall)?,