mirror of
https://github.com/genodelabs/genode.git
synced 2025-06-20 16:10:29 +00:00
@ -39,8 +39,8 @@ namespace Genode {
|
||||
addr_t const _phys_addr = 0; /* address of dataspace in physical memory */
|
||||
addr_t _core_local_addr = 0; /* address of core-local mapping */
|
||||
size_t const _size = 0; /* size of dataspace in bytes */
|
||||
bool const _io_mem = false; /* dataspace is I/O mem, not to be touched */
|
||||
bool const _writable = false; /* false if dataspace is read-only */
|
||||
bool const _io_mem = false; /* dataspace is I/O mem, not to be touched */
|
||||
bool const _writeable = false; /* false if dataspace is read-only */
|
||||
|
||||
/*
|
||||
* Access memory cached, write-combined, or uncached respectively
|
||||
@ -79,12 +79,12 @@ namespace Genode {
|
||||
* This constructor is used by RAM and ROM dataspaces.
|
||||
*/
|
||||
Dataspace_component(size_t size, addr_t core_local_addr,
|
||||
Cache cache, bool writable,
|
||||
Cache cache, bool writeable,
|
||||
Dataspace_owner *owner)
|
||||
:
|
||||
_phys_addr(core_local_addr), _core_local_addr(core_local_addr),
|
||||
_size(round_page(size)), _io_mem(false),
|
||||
_writable(writable), _cache(cache),
|
||||
_writeable(writeable), _cache(cache),
|
||||
_owner(owner), _managed(false) { }
|
||||
|
||||
/**
|
||||
@ -99,10 +99,10 @@ namespace Genode {
|
||||
*/
|
||||
Dataspace_component(size_t size, addr_t core_local_addr,
|
||||
addr_t phys_addr, Cache cache,
|
||||
bool writable, Dataspace_owner *owner)
|
||||
bool writeable, Dataspace_owner *owner)
|
||||
:
|
||||
_phys_addr(phys_addr), _core_local_addr(core_local_addr),
|
||||
_size(size), _io_mem(true), _writable(writable),
|
||||
_size(size), _io_mem(true), _writeable(writeable),
|
||||
_cache(cache), _owner(owner), _managed(false) { }
|
||||
|
||||
/**
|
||||
@ -156,8 +156,8 @@ namespace Genode {
|
||||
** Dataspace interface **
|
||||
*************************/
|
||||
|
||||
size_t size() override { return _size; }
|
||||
bool writable() override { return _writable; }
|
||||
size_t size() override { return _size; }
|
||||
bool writeable() override { return _writeable; }
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -213,7 +213,7 @@ int Rm_client::pager(Ipc_pager &pager)
|
||||
* Check if dataspace is compatible with page-fault type
|
||||
*/
|
||||
if (pf_type == Region_map::State::WRITE_FAULT &&
|
||||
(!region->write() || !dsc->writable())) {
|
||||
(!region->write() || !dsc->writeable())) {
|
||||
|
||||
print_page_fault("attempted write at read-only memory",
|
||||
pf_addr, pf_ip, pf_type, *this);
|
||||
@ -346,7 +346,7 @@ Mapping Region_map_component::create_map_item(Region_map_component *,
|
||||
.io_mem = dataspace.io_mem(),
|
||||
.dma_buffer = region.dma(),
|
||||
.write_combined = dataspace.cacheability() == WRITE_COMBINED,
|
||||
.writeable = region.write() && dataspace.writable(),
|
||||
.writeable = region.write() && dataspace.writeable(),
|
||||
.executable = region.executable() };
|
||||
}
|
||||
|
||||
|
@ -73,7 +73,7 @@ void Vm_session_component::attach(Dataspace_capability const cap,
|
||||
{
|
||||
.base = guest_phys,
|
||||
.size = attribute.size,
|
||||
.write = dsc.writable() && attribute.writeable,
|
||||
.write = dsc.writeable() && attribute.writeable,
|
||||
.exec = attribute.executable,
|
||||
.off = (off_t)attribute.offset,
|
||||
.dma = false,
|
||||
|
Reference in New Issue
Block a user