mara/redox
Watch
0
0
Fork
You've already forked redox
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: Copy usermode stack

Browse source
This commit is contained in:
Jeremy Soller 2016-09-13 21:27:27 -06:00
commit 6e16298e71
1 changed files with 67 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/elf.rs
View file

@ -55,8 +55,6 @@ impl<'a> Elf<'a> {
/// Test function to run. Remove and replace with proper syscall
pub fn run(self) -> SysResult<!> {
let stack_addr = arch::USER_STACK_OFFSET;
let stack_size = arch::USER_STACK_SIZE;
{
let contexts = context::contexts();
let context_lock = contexts.current().ok_or(Error::NoProcess)?;
@ -105,8 +103,8 @@ impl<'a> Elf<'a> {
// Map stack
context.stack = Some(context::memory::Memory::new(
VirtualAddress::new(stack_addr),
stack_size,
VirtualAddress::new(arch::USER_STACK_OFFSET),
arch::USER_STACK_SIZE,
entry::NO_EXECUTE | entry::WRITABLE | entry::USER_ACCESSIBLE,
true,
true
@ -114,7 +112,7 @@ impl<'a> Elf<'a> {
}
// Go to usermode
unsafe { usermode(self.entry(), stack_addr + stack_size - 256); }
unsafe { usermode(self.entry(), arch::USER_STACK_OFFSET + arch::USER_STACK_SIZE - 256); }
}
}