diff --git a/kernel/src/arch/riscv/process.rs b/kernel/src/arch/riscv/process.rs index 7bbb8fc85..98dd26413 100644 --- a/kernel/src/arch/riscv/process.rs +++ b/kernel/src/arch/riscv/process.rs @@ -13,13 +13,12 @@ pub struct Process { scratch: usize, /// The index into the `contexts` list. This must never be 0. - context_nr: usize, + context_nr: u16, /// The previous context number prior to banking - banked_context_nr: usize, + banked_context_nr: u16, _hash: [usize; 8], - _padding: [usize; 14], /// Global parameters used by the operating system pub inner: ProcessInner, @@ -49,7 +48,7 @@ pub struct ProcessContext { impl Process { pub fn current_context(&mut self) -> &mut ProcessContext { // println!("current_context({:?}", self); - &mut self.contexts[self.context_nr - 1] + &mut self.contexts[self.context_nr as usize - 1] } pub fn trap_context(&mut self) -> &mut ProcessContext { diff --git a/kernel/src/services.rs b/kernel/src/services.rs index 63a9c85c4..1ea7c3f16 100644 --- a/kernel/src/services.rs +++ b/kernel/src/services.rs @@ -90,6 +90,9 @@ pub struct ProcessInner { /// Maximum size of the heap pub mem_heap_max: usize, + + /// Which context to return to when `reply_message()` is called + pub ctx_reply: [(PID, u8); 30], } impl Default for ProcessInner { @@ -102,6 +105,7 @@ impl Default for ProcessInner { mem_heap_base: arch::mem::DEFAULT_HEAP_BASE, mem_heap_size: 0, mem_heap_max: 524288, + ctx_reply: [(0, 0); 30], } } }