From f53502d9a247a48d0dcefa159c1d9e2cd2071887 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 29 Jul 2025 17:19:18 +0800 Subject: [PATCH 1/4] Update kernel/src/services.rs Co-authored-by: Sean Cross --- kernel/src/services.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/src/services.rs b/kernel/src/services.rs index 2753033e8..9abc5832b 100644 --- a/kernel/src/services.rs +++ b/kernel/src/services.rs @@ -1316,7 +1316,7 @@ impl SystemServices { // return argument based upon the lazy_arg type // 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. From a35f20b1c880263c9cf44eaf683c97dd59a06dba Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 29 Jul 2025 17:19:26 +0800 Subject: [PATCH 2/4] Update kernel/src/services.rs Co-authored-by: Sean Cross --- kernel/src/services.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/src/services.rs b/kernel/src/services.rs index 9abc5832b..b07a61199 100644 --- a/kernel/src/services.rs +++ b/kernel/src/services.rs @@ -1180,7 +1180,7 @@ impl SystemServices { let mut arch_process = ArchProcess::current(); arch_process.set_thread_result(new_tid, result); } - _ => (), + None => (), } // Mark the previous process as ready to run, since we just switched From d58a0c763f6f41d476c1afe0fe36d870601e98f2 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 29 Jul 2025 17:20:35 +0800 Subject: [PATCH 3/4] Update kernel/src/services.rs Co-authored-by: Sean Cross --- kernel/src/services.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/src/services.rs b/kernel/src/services.rs index b07a61199..352b0c555 100644 --- a/kernel/src/services.rs +++ b/kernel/src/services.rs @@ -1255,7 +1255,7 @@ impl SystemServices { PostActivateOp::SetThreadResult(result) => { ArchProcess::current().set_thread_result(new_tid, result); } - _ => (), + None => (), } let new = self.get_process_mut(new_pid)?; From 2119413b7da8d9004515bb60d75a70e8c4e4446b Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 29 Jul 2025 17:20:50 +0800 Subject: [PATCH 4/4] Update kernel/src/syscall.rs Co-authored-by: Sean Cross --- kernel/src/syscall.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/src/syscall.rs b/kernel/src/syscall.rs index 1b41951b4..2e05959f1 100644 --- a/kernel/src/syscall.rs +++ b/kernel/src/syscall.rs @@ -625,7 +625,7 @@ fn reply_and_receive_next( response.pid, response.tid, false, - crate::services::PostActivateOp::SetThreadResult(response.result), + PostActivateOp::SetThreadResult(response.result), ) .map(|_| Ok(xous_kernel::Result::ResumeProcess)) .unwrap_or(Err(xous_kernel::Error::ProcessNotFound))