Skip to content
Snippets Groups Projects
Verified Commit 69cbb548 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Mark heap executable for mesa (temporary)

parent 876e01e5
No related branches found
No related tags found
No related merge requests found
...@@ -167,7 +167,7 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<ContextId> { ...@@ -167,7 +167,7 @@ pub fn clone(flags: usize, stack_base: usize) -> Result<ContextId> {
let mut new_heap = context::memory::Memory::new( let mut new_heap = context::memory::Memory::new(
VirtualAddress::new(::USER_TMP_HEAP_OFFSET), VirtualAddress::new(::USER_TMP_HEAP_OFFSET),
heap.size(), heap.size(),
EntryFlags::PRESENT | EntryFlags::NO_EXECUTE | EntryFlags::WRITABLE, EntryFlags::PRESENT | /* TODO: Hack for mesa: EntryFlags::NO_EXECUTE | */ EntryFlags::WRITABLE,
false false
); );
...@@ -639,7 +639,7 @@ fn fexec_noreturn( ...@@ -639,7 +639,7 @@ fn fexec_noreturn(
context.heap = Some(context::memory::Memory::new( context.heap = Some(context::memory::Memory::new(
VirtualAddress::new(::USER_HEAP_OFFSET), VirtualAddress::new(::USER_HEAP_OFFSET),
0, 0,
EntryFlags::NO_EXECUTE | EntryFlags::WRITABLE | EntryFlags::USER_ACCESSIBLE, /* TODO: Hack for mesa: EntryFlags::NO_EXECUTE | */ EntryFlags::WRITABLE | EntryFlags::USER_ACCESSIBLE,
true true
).to_shared()); ).to_shared());
...@@ -1337,7 +1337,7 @@ pub fn waitpid(pid: ContextId, status_ptr: usize, flags: usize) -> Result<Contex ...@@ -1337,7 +1337,7 @@ pub fn waitpid(pid: ContextId, status_ptr: usize, flags: usize) -> Result<Contex
let context_lock = contexts.get(pid).ok_or(Error::new(ECHILD))?; let context_lock = contexts.get(pid).ok_or(Error::new(ECHILD))?;
let mut context = context_lock.write(); let mut context = context_lock.write();
if context.ppid != ppid { if context.ppid != ppid {
println!("Hack for rustc - changing ppid of {} from {} to {}", context.id.into(), context.ppid.into(), ppid.into()); println!("TODO: Hack for rustc - changing ppid of {} from {} to {}", context.id.into(), context.ppid.into(), ppid.into());
context.ppid = ppid; context.ppid = ppid;
//return Err(Error::new(ECHILD)); //return Err(Error::new(ECHILD));
Some(context.status) Some(context.status)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment