6b289a1423
This patch replaces the former prominent use of pointers by references wherever feasible. This has the following benefits: * The contract between caller and callee becomes more obvious. When passing a reference, the contract says that the argument cannot be a null pointer. The caller is responsible to ensure that. Therefore, the use of reference eliminates the need to add defensive null-pointer checks at the callee site, which sometimes merely exist to be on the safe side. The bottom line is that the code becomes easier to follow. * Reference members must be initialized via an object initializer, which promotes a programming style that avoids intermediate object- construction states. Within core, there are still a few pointers as member variables left though. E.g., caused by the late association of 'Platform_thread' objects with their 'Platform_pd' objects. * If no pointers are present as member variables, we don't need to manually provide declarations of a private copy constructor and an assignment operator to avoid -Weffc++ errors "class ... has pointer data members [-Werror=effc++]". This patch also changes a few system bindings on NOVA and Fiasco.OC, e.g., the return value of the global 'cap_map' accessor has become a reference. Hence, the patch touches a few places outside of core. Fixes #3135
105 lines
2.8 KiB
C++
105 lines
2.8 KiB
C++
/*
|
|
* \brief Core-local region map
|
|
* \author Norman Feske
|
|
* \date 2009-10-02
|
|
*/
|
|
|
|
/*
|
|
* Copyright (C) 2009-2017 Genode Labs GmbH
|
|
*
|
|
* This file is part of the Genode OS framework, which is distributed
|
|
* under the terms of the GNU Affero General Public License version 3.
|
|
*/
|
|
|
|
/* Genode includes */
|
|
#include <base/log.h>
|
|
|
|
/* core includes */
|
|
#include <core_region_map.h>
|
|
#include <platform.h>
|
|
#include <util.h>
|
|
#include <nova_util.h>
|
|
|
|
/* NOVA includes */
|
|
#include <nova/syscalls.h>
|
|
|
|
using namespace Genode;
|
|
|
|
/**
|
|
* Map dataspace core-locally
|
|
*/
|
|
static inline void * alloc_region(Dataspace_component &ds, const size_t size)
|
|
{
|
|
/*
|
|
* Allocate range in core's virtual address space
|
|
*
|
|
* Start with trying to use natural alignment. If this does not work,
|
|
* successively weaken the alignment constraint until we hit the page size.
|
|
*/
|
|
void *virt_addr = 0;
|
|
size_t align_log2 = log2(ds.size());
|
|
for (; align_log2 >= get_page_size_log2(); align_log2--) {
|
|
if (platform().region_alloc().alloc_aligned(size,
|
|
&virt_addr, align_log2).ok())
|
|
break;
|
|
}
|
|
|
|
return virt_addr;
|
|
}
|
|
|
|
Region_map::Local_addr
|
|
Core_region_map::attach(Dataspace_capability ds_cap, size_t,
|
|
off_t offset, bool use_local_addr,
|
|
Region_map::Local_addr,
|
|
bool executable, bool writeable)
|
|
{
|
|
auto lambda = [&] (Dataspace_component *ds_ptr) -> Local_addr {
|
|
if (!ds_ptr)
|
|
throw Invalid_dataspace();
|
|
|
|
Dataspace_component &ds = *ds_ptr;
|
|
|
|
if (use_local_addr) {
|
|
error("Parameter 'use_local_addr' not supported within core");
|
|
return nullptr;
|
|
}
|
|
|
|
if (offset) {
|
|
error("Parameter 'offset' not supported within core");
|
|
return nullptr;
|
|
}
|
|
|
|
const size_t page_rounded_size = align_addr(ds.size(), get_page_size_log2());
|
|
|
|
/* allocate the virtual region contiguous for the dataspace */
|
|
void * virt_ptr = alloc_region(ds, page_rounded_size);
|
|
if (!virt_ptr)
|
|
throw Out_of_ram();
|
|
|
|
/* map it */
|
|
Nova::Utcb &utcb = *reinterpret_cast<Nova::Utcb *>(Thread::myself()->utcb());
|
|
const Nova::Rights rights(true, writeable && ds.writable(), executable);
|
|
|
|
if (map_local(platform_specific().core_pd_sel(), utcb,
|
|
ds.phys_addr(), reinterpret_cast<addr_t>(virt_ptr),
|
|
page_rounded_size >> get_page_size_log2(), rights, true)) {
|
|
platform().region_alloc().free(virt_ptr, page_rounded_size);
|
|
throw Out_of_ram();
|
|
}
|
|
|
|
return virt_ptr;
|
|
};
|
|
return _ep.apply(ds_cap, lambda);
|
|
}
|
|
|
|
|
|
void Core_region_map::detach(Local_addr core_local_addr)
|
|
{
|
|
size_t size = platform_specific().region_alloc_size_at(core_local_addr);
|
|
|
|
unmap_local(*reinterpret_cast<Nova::Utcb *>(Thread::myself()->utcb()),
|
|
core_local_addr, size >> get_page_size_log2());
|
|
|
|
platform().region_alloc().free(core_local_addr);
|
|
}
|