diff --git a/xous-rs/src/arch/riscv/process.rs b/xous-rs/src/arch/riscv/process.rs index 9df54478c..9d5d09f39 100644 --- a/xous-rs/src/arch/riscv/process.rs +++ b/xous-rs/src/arch/riscv/process.rs @@ -6,11 +6,33 @@ use core::convert::TryFrom; #[derive(Debug, Clone, Copy, PartialEq)] pub struct ProcessArgs<'a> { stub: &'a [u8], + stack: crate::MemoryRange, + load_address: crate::MemoryAddress, + entrypoint: crate::MemoryAddress, } impl<'a> ProcessArgs<'a> { - pub fn new(stub: &[u8]) -> ProcessArgs { - ProcessArgs { stub } + pub fn new( + stub: &[u8], + load_address: crate::MemoryAddress, + entrypoint: crate::MemoryAddress, + ) -> ProcessArgs { + ProcessArgs { + load_address, + entrypoint, + stub, + stack: unsafe { crate::MemoryRange::new(0x8000_0000 - 131072, 131072).unwrap() }, + } + } + + pub fn stack_base(mut self, base: crate::MemoryAddress) -> ProcessArgs<'a> { + self.stack.addr = base; + self + } + + pub fn stack_size(mut self, length: crate::MemorySize) -> ProcessArgs<'a> { + self.stack.size = length; + self } } @@ -133,7 +155,7 @@ pub fn create_process_pre(args: &ProcessArgs) -> core::result::Result