ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

noux: attach executable memory as such 

Issue #1723
This commit is contained in:
Alexander Boettcher 2017-10-20 11:43:57 +02:00 committed by Christian Helmuth
parent e6dcdcf277
commit dfa8b787be
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
repos/ports/src/noux/region_map_component.h
View File

@ -53,13 +53,14 @@ class Noux::Region_map_component : public Rpc_object<Region_map>,
size_t size; size_t size;
off_t offset; off_t offset;
addr_t local_addr; addr_t local_addr;
bool executable;
Region(Region_map_component &rm, Region(Region_map_component &rm,
Dataspace_capability ds, size_t size, Dataspace_capability ds, size_t size,
off_t offset, addr_t local_addr) off_t offset, addr_t local_addr, bool exec)
: :
rm(rm), ds(ds), size(size), offset(offset), rm(rm), ds(ds), size(size), offset(offset),
local_addr(local_addr) local_addr(local_addr), executable(exec)
{ } { }
/** /**
@ -217,7 +218,9 @@ class Noux::Region_map_component : public Rpc_object<Region_map>,
return; return;
} }
dst_rm.attach(ds, curr->size, curr->offset, true, curr->local_addr); enum { USE_LOCAL_ADDR = true };
dst_rm.attach(ds, curr->size, curr->offset, USE_LOCAL_ADDR,
curr->local_addr, curr->executable);
}; };
_ds_registry.apply(curr->ds, lambda); _ds_registry.apply(curr->ds, lambda);
}; };
@ -249,8 +252,8 @@ class Noux::Region_map_component : public Rpc_object<Region_map>,
catch (Out_of_caps) { _pd.upgrade_caps(2); } catch (Out_of_caps) { _pd.upgrade_caps(2); }
} }
Region * region = new (_alloc) Region * region = new (_alloc) Region(*this, ds, size, offset,
Region(*this, ds, size, offset, local_addr); local_addr, executable);
/* register region as user of RAM dataspaces */ /* register region as user of RAM dataspaces */
auto lambda = [&] (Dataspace_info *info) auto lambda = [&] (Dataspace_info *info)