Merge branch 'more-opt' of github.com:betrusted-io/xous-core into more-opt

This commit is contained in:
bunnie 2025-07-29 17:24:26 +08:00
commit 4ba2b476d1
2 changed files with 4 additions and 4 deletions

View file

@ -1186,7 +1186,7 @@ impl SystemServices {
let mut arch_process = ArchProcess::current(); let mut arch_process = ArchProcess::current();
arch_process.set_thread_result(new_tid, result); arch_process.set_thread_result(new_tid, result);
} }
_ => (), None => (),
} }
// Mark the previous process as ready to run, since we just switched // Mark the previous process as ready to run, since we just switched
@ -1261,7 +1261,7 @@ impl SystemServices {
PostActivateOp::SetThreadResult { result } => { PostActivateOp::SetThreadResult { result } => {
ArchProcess::current().set_thread_result(new_tid, result); ArchProcess::current().set_thread_result(new_tid, result);
} }
_ => (), None => (),
} }
let new = self.get_process_mut(new_pid)?; let new = self.get_process_mut(new_pid)?;
@ -1322,7 +1322,7 @@ impl SystemServices {
// return argument based upon the lazy_arg type // return argument based upon the lazy_arg type
// we get "lucky" in that sender_idx *and* new_tid are both `usize` types underneath // we get "lucky" in that sender_idx *and* new_tid are both `usize` types underneath
if let Some(si) = sender_idx { Ok(si) } else { Ok(new_tid) } Ok(sender_idx.unwrap_or(new_tid))
} }
/// Move memory from one process to another. /// Move memory from one process to another.

View file

@ -633,7 +633,7 @@ fn reply_and_receive_next(
response.pid, response.pid,
response.tid, response.tid,
false, false,
crate::services::PostActivateOp::SetThreadResult { result: response.result }, PostActivateOp::SetThreadResult(response.result),
) )
.map(|_| Ok(xous_kernel::Result::ResumeProcess)) .map(|_| Ok(xous_kernel::Result::ResumeProcess))
.unwrap_or(Err(xous_kernel::Error::ProcessNotFound)) .unwrap_or(Err(xous_kernel::Error::ProcessNotFound))