17c79a9e23
Besides adapting the components to the use of base/log.h, the patch cleans up a few base headers, i.e., it removes unused includes from root/component.h, specifically base/heap.h and ram_session/ram_session.h. Hence, components that relied on the implicit inclusion of those headers have to manually include those headers now. While adjusting the log messages, I repeatedly stumbled over the problem that printing char * arguments is ambiguous. It is unclear whether to print the argument as pointer or null-terminated string. To overcome this problem, the patch introduces a new type 'Cstring' that allows the caller to express that the argument should be handled as null-terminated string. As a nice side effect, with this type in place, the optional len argument of the 'String' class could be removed. Instead of supplying a pair of (char const *, size_t), the constructor accepts a 'Cstring'. This, in turn, clears the way let the 'String' constructor use the new output mechanism to assemble a string from multiple arguments (and thereby getting rid of snprintf within Genode in the near future). To enforce the explicit resolution of the char * ambiguity, the 'char *' overload of the 'print' function is marked as deleted. Issue #1987
69 lines
1.7 KiB
C++
69 lines
1.7 KiB
C++
/*
|
|
* \brief OKL4-specific implementation of core-local region map
|
|
* \author Norman Feske
|
|
* \date 2009-04-02
|
|
*/
|
|
|
|
/*
|
|
* Copyright (C) 2009-2013 Genode Labs GmbH
|
|
*
|
|
* This file is part of the Genode OS framework, which is distributed
|
|
* under the terms of the GNU General Public License version 2.
|
|
*/
|
|
|
|
/* core includes */
|
|
#include <platform.h>
|
|
#include <core_region_map.h>
|
|
#include <map_local.h>
|
|
|
|
using namespace Genode;
|
|
|
|
|
|
Region_map::Local_addr
|
|
Core_region_map::attach(Dataspace_capability ds_cap, size_t size,
|
|
off_t offset, bool use_local_addr,
|
|
Region_map::Local_addr, bool executable)
|
|
{
|
|
using namespace Okl4;
|
|
|
|
auto lambda = [&] (Dataspace_component *ds) -> void* {
|
|
if (!ds)
|
|
throw Invalid_dataspace();
|
|
|
|
if (size == 0)
|
|
size = ds->size();
|
|
|
|
size_t page_rounded_size = (size + get_page_size() - 1)
|
|
& get_page_mask();
|
|
|
|
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;
|
|
}
|
|
|
|
/* allocate range in core's virtual address space */
|
|
void *virt_addr;
|
|
if (!platform()->region_alloc()->alloc(page_rounded_size, &virt_addr)) {
|
|
error("could not allocate virtual address range in core of size ",
|
|
page_rounded_size);
|
|
return nullptr;
|
|
}
|
|
|
|
/* map the dataspace's physical pages to corresponding virtual addresses */
|
|
unsigned num_pages = page_rounded_size >> get_page_size_log2();
|
|
if (!map_local(ds->phys_addr(), (addr_t)virt_addr, num_pages))
|
|
return nullptr;
|
|
return virt_addr;
|
|
};
|
|
|
|
return _ep.apply(ds_cap, lambda);
|
|
}
|
|
|
|
|
|
void Core_region_map::detach(Local_addr) { }
|