ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-19 05:37:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base: uniform base-internal header structure

Browse Source 
This patch establishes a common organization of header files
internal to the base framework. The internal headers are located at
'<repository>/src/include/base/internal/'. This structure has been
choosen to make the nature of those headers immediately clear when
included:

  #include <base/internal/lock_helper.h>

Issue #1832
This commit is contained in:
Norman Feske 2016-01-20 18:27:18 +01:00 committed by Christian Helmuth
parent be496c6dc1
commit e6729316ff
128 changed files with 179 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
repos/base-fiasco/lib/mk/base-common.mk
View File

@ -24,8 +24,7 @@ SRC_CC += thread/myself.cc
SRC_CC += thread/context_allocator.cc
SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath cap_copy.cc $(BASE_DIR)/src/lib/startup
vpath %.cc $(REP_DIR)/src/base

2
repos/base-fiasco/lib/mk/base.mk
View File

@ -13,7 +13,7 @@ SRC_CC += thread/thread_start.cc
SRC_CC += irq/platform.cc
SRC_CC += server/rpc_cap_alloc.cc
INC_DIR += $(BASE_DIR)/src/base/env
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

4
repos/base-fiasco/src/core/target.inc
View File

@ -37,8 +37,8 @@ SRC_CC += context_area.cc \
INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \
$(REP_DIR)/src/base/console \
$(BASE_DIR)/src/base/thread
$(REP_DIR)/src/include \
$(BASE_DIR)/src/include
LIBS += base-common

0
repos/base-fiasco/src/base/console/core_console.h → repos/base-fiasco/src/include/base/internal/core_console.h
View File

0
repos/base-fiasco/src/base/lock/lock_helper.h → repos/base-fiasco/src/include/base/internal/lock_helper.h
View File

4
repos/base-foc/lib/mk/base-common.mk
View File

@ -24,9 +24,7 @@ SRC_CC += thread/myself.cc
SRC_CC += thread/context_allocator.cc
SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

2
repos/base-foc/lib/mk/base.mk
View File

@ -14,7 +14,7 @@ SRC_CC += thread/thread_start.cc
SRC_CC += irq/platform.cc
SRC_CC += server/rpc_cap_alloc.cc
INC_DIR += $(BASE_DIR)/src/base/env
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

6
repos/base-foc/src/base/env/cap_map.cc vendored
View File

@ -13,14 +13,16 @@
* under the terms of the GNU General Public License version 2.
*/
/* Genode includes */
#include <base/cap_map.h>
#include <base/native_types.h>
#include <util/assert.h>
/* Lock implementation local include */
#include <spin_lock.h>
/* base-internal includes */
#include <base/internal/spin_lock.h>
/* kernel includes */
namespace Fiasco {
#include <l4/sys/consts.h>
#include <l4/sys/task.h>

4
repos/base-foc/src/base/env/spin_lock.cc vendored
View File

@ -16,8 +16,8 @@
/* Genode includes */
#include <base/cap_map.h>
/* Lock implementation local include */
#include <spin_lock.h>
/* base-internal includes */
#include <base/internal/spin_lock.h>
Genode::Spin_lock::Spin_lock() : _spinlock(SPINLOCK_UNLOCKED) {}

4
repos/base-foc/src/base/ipc/ipc.cc
View File

@ -27,8 +27,8 @@
#include <base/thread.h>
#include <util/assert.h>
/* base-foc/src/base/lock */
#include <lock_helper.h> /* for 'thread_get_my_native_id()' */
/* base-internal includes */
#include <base/internal/lock_helper.h> /* for 'thread_get_my_native_id()' */
/* Fiasco.OC includes */
namespace Fiasco {

6
repos/base-foc/src/core/target.inc
View File

@ -40,10 +40,8 @@ SRC_CC += context_area.cc \
INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \
$(REP_DIR)/src/base/lock \
$(BASE_DIR)/src/base/lock \
$(BASE_DIR)/src/base/thread \
$(REP_DIR)/src/base/console
$(REP_DIR)/src/include \
$(BASE_DIR)/src/include
include $(GEN_CORE_DIR)/version.inc

0
repos/base-foc/src/base/console/core_console.h → repos/base-foc/src/include/base/internal/core_console.h
View File

0
repos/base-foc/src/base/lock/lock_helper.h → repos/base-foc/src/include/base/internal/lock_helper.h
View File

6
repos/base-foc/src/lib/startup/_main_parent_cap.h → repos/base-foc/src/include/startup/internal/_main_parent_cap.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2.
*/
#ifndef _LIB__STARTUP___MAIN_PARENT_CAP_H_
#define _LIB__STARTUP___MAIN_PARENT_CAP_H_
#ifndef _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
#define _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_
#include <base/native_types.h>
@ -41,4 +41,4 @@ namespace Genode {
}
}
#endif /* _LIB__STARTUP___MAIN_PARENT_CAP_H_ */
#endif /* _INCLUDE__STARTUP__INTERNAL___MAIN_PARENT_CAP_H_ */

10
repos/base-hw/lib/mk/base-common.inc
View File

@ -1,14 +1,12 @@
#
# \brief Portions of base library shared by core and non-core processes
# \brief Portions of base library shared by core and non-core components
# \author Norman Feske
# \author Martin Stein
# \date 2013-02-14
#
# add library dependencies
LIBS += cxx
# add C++ sources
SRC_CC += ipc/ipc.cc
SRC_CC += avl_tree/avl_tree.cc
SRC_CC += allocator/slab.cc
@ -31,11 +29,7 @@ SRC_CC += thread/context_allocator.cc
SRC_CC += kernel/interface.cc
SRC_CC += sleep.cc
# add include paths
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
# declare source locations
vpath % $(REP_DIR)/src/base
vpath % $(BASE_DIR)/src/base

10
repos/base-hw/lib/mk/base.mk
View File

@ -1,13 +1,11 @@
#
# \brief Portions of base library that are exclusive to non-core processes
# \brief Portions of base library that are exclusive to non-core components
# \author Norman Feske
# \date 2013-02-14
#
# add library dependencies
LIBS += base-common startup
# add C++ sources
SRC_CC += console/log_console.cc
SRC_CC += cpu/cache.cc
SRC_CC += env/env.cc
@ -19,11 +17,7 @@ SRC_CC += env.cc
SRC_CC += capability.cc
SRC_CC += server/rpc_cap_alloc.cc
# add include paths
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/env
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
# declare source locations
vpath % $(REP_DIR)/src/base
vpath % $(BASE_DIR)/src/base

7
repos/base-hw/lib/mk/core.inc
View File

@ -11,11 +11,8 @@ LIBS += core-perf_counter
LIBS += base-common
# add include paths
INC_DIR += $(REP_DIR)/src/core/include
INC_DIR += $(BASE_DIR)/src/core/include
INC_DIR += $(BASE_DIR)/src/base/include
INC_DIR += $(BASE_DIR)/src/base/thread
INC_DIR += $(BASE_DIR)/src/lib/startup
INC_DIR += $(REP_DIR)/src/core/include $(BASE_DIR)/src/core/include
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
# add C++ sources
SRC_CC += console.cc

4
repos/base-hw/src/base/capability.cc
View File

@ -12,9 +12,11 @@
*/
/* Genode includes */
#include <spin_lock.h>
#include <base/capability.h>
/* base-internal includes */
#include <base/internal/spin_lock.h>
static volatile int spinlock = SPINLOCK_UNLOCKED;
static Genode::uint8_t ref_counter[1 << (sizeof(Kernel::capid_t)*8)];

4
repos/base-hw/src/core/console.cc
View File

@ -18,8 +18,8 @@
/* core includes */
#include <serial.h>
/* base includes */
#include <unmanaged_singleton.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
namespace Genode
{

4
repos/base-hw/src/core/include/kernel/irq.h
View File

@ -18,9 +18,11 @@
/* Genode includes */
#include <base/native_types.h>
#include <irq_session/irq_session.h>
#include <unmanaged_singleton.h>
#include <util/avl_tree.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
/* core includes */
#include <kernel/signal_receiver.h>

4
repos/base-hw/src/core/include/pager.h
View File

@ -19,7 +19,9 @@
#include <base/object_pool.h>
#include <base/signal.h>
#include <pager/capability.h>
#include <unmanaged_singleton.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
/* core-local includes */
#include <kernel/signal_receiver.h>

2
repos/base-hw/src/core/include/spec/x86/cpu_support.h
View File

@ -22,7 +22,7 @@
#include <cpu/cpu_state.h>
/* base includes */
#include <unmanaged_singleton.h>
#include <base/internal/unmanaged_singleton.h>
/* core includes */
#include <fpu.h>

4
repos/base-hw/src/core/kernel/cpu.cc
View File

@ -22,8 +22,8 @@
#include <timer.h>
#include <assert.h>
/* base includes */
#include <unmanaged_singleton.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
using namespace Kernel;

2
repos/base-hw/src/core/kernel/init.cc
View File

@ -22,7 +22,7 @@
#include <platform_thread.h>
/* base includes */
#include <unmanaged_singleton.h>
#include <base/internal/unmanaged_singleton.h>
#include <base/native_types.h>
using namespace Kernel;

4
repos/base-hw/src/core/kernel/pd.cc
View File

@ -19,7 +19,9 @@
/* Genode includes */
#include <assert.h>
#include <page_flags.h>
#include <unmanaged_singleton.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
using namespace Kernel;

4
repos/base-hw/src/core/kernel/thread.cc
View File

@ -14,10 +14,12 @@
/* Genode includes */
#include <base/thread_state.h>
#include <unmanaged_singleton.h>
#include <cpu_session/cpu_session.h>
#include <util/construct_at.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
/* core includes */
#include <assert.h>
#include <kernel/kernel.h>

2
repos/base-hw/src/core/platform.cc
View File

@ -136,7 +136,7 @@ Platform::Platform()
init_alloc(_core_mem_alloc.virt_alloc(), virt_region,
_core_only_ram_regions, get_page_size_log2());
/* preserve context area in core's virtual address space */
/* preserve stack area in core's virtual address space */
_core_mem_alloc.virt_alloc()->remove_range(
Native_config::context_area_virtual_base(),
Native_config::context_area_virtual_size());

4
repos/base-hw/src/core/spec/arm/smp/kernel/cpu.cc
View File

@ -16,8 +16,8 @@
#include <kernel/kernel.h>
#include <kernel/cpu.h>
/* base includes */
#include <unmanaged_singleton.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
/* spin-lock used to synchronize kernel access of different cpus */

4
repos/base-hw/src/core/spec/panda/platform_support.cc
View File

@ -17,7 +17,9 @@
#include <cpu.h>
#include <pic.h>
#include <cortex_a9_wugen.h>
#include <unmanaged_singleton.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
using namespace Genode;

4
repos/base-hw/src/core/spec/zynq/platform_support.cc
View File

@ -17,7 +17,9 @@
#include <board.h>
#include <cpu.h>
#include <pic.h>
#include <unmanaged_singleton.h>
/* base-internal includes */
#include <base/internal/unmanaged_singleton.h>
using namespace Genode;

0
repos/base-hw/src/base/lock/lock_helper.h → repos/base-hw/src/include/base/internal/lock_helper.h
View File

0
repos/base-hw/src/lib/startup/_main_parent_cap.h → repos/base-hw/src/include/startup/internal/_main_parent_cap.h
View File

6
repos/base-linux/lib/mk/base-common.mk
View File

@ -23,11 +23,7 @@ SRC_CC += thread/trace.cc thread/thread_env.cc thread/context_allocator.cc
SRC_CC += irq/platform.cc
SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base/lock $(BASE_DIR)/src/base/lock
INC_DIR += $(REP_DIR)/src/base/ipc
INC_DIR += $(REP_DIR)/src/base/env $(BASE_DIR)/src/base/env
INC_DIR += $(BASE_DIR)/src/lib/startup
INC_DIR += $(BASE_DIR)/src/base/thread
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

2
repos/base-linux/lib/mk/base.inc
View File

@ -13,7 +13,7 @@ SRC_CC += console/log_console.cc
SRC_CC += env/env.cc env/platform_env.cc env/context_area.cc
SRC_CC += server/rpc_cap_alloc.cc
INC_DIR += $(REP_DIR)/src/base/env $(BASE_DIR)/src/base/env
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

1
repos/base-linux/lib/mk/base.mk
View File

@ -5,6 +5,7 @@
#
LIBS += startup cxx
SRC_CC += thread/thread.cc thread/myself.cc thread/thread_linux.cc
SRC_CC += server/rpc_cap_alloc.cc

4
repos/base-linux/src/base/env/platform_env.cc vendored
View File

@ -17,8 +17,8 @@
#include <linux_dataspace/client.h>
#include <linux_syscalls.h>
/* local includes */
#include <platform_env.h>
/* base-internal includes */
#include <base/internal/platform_env.h>
using namespace Genode;

6
repos/base-linux/src/base/env/rm_session_mmap.cc vendored
View File

@ -37,10 +37,10 @@
#include <base/thread.h>
#include <linux_dataspace/client.h>
#include <linux_syscalls.h>
#include <context_area.h>
/* local includes */
#include <platform_env.h>
/* base-internal includes */
#include <base/internal/platform_env.h>
#include <base/internal/context_area.h>
using namespace Genode;

4
repos/base-linux/src/base/ipc/ipc.cc
View File

@ -34,8 +34,8 @@
#include <base/env.h>
#include <linux_cpu_session/linux_cpu_session.h>
/* local includes */
#include <socket_descriptor_registry.h>
/* base-internal includes */
#include <base/internal/socket_descriptor_registry.h>
/* Linux includes */
#include <linux_syscalls.h>

3
repos/base-linux/src/core/context_area.cc
View File

@ -17,7 +17,8 @@
#include <base/printf.h>
#include <base/thread.h>
#include <context_area.h>
/* base-internal includes */
#include <base/internal/context_area.h>
/**

4
repos/base-linux/src/core/include/core_env.h
View File

@ -25,8 +25,8 @@
#include <ram_session_component.h>
#include <core_pd_session.h>
/* internal base includes */
#include <platform_env.h>
/* base-internal includes */
#include <base/internal/platform_env.h>
namespace Genode {

4
repos/base-linux/src/core/include/server_socket_pair.h
View File

@ -19,8 +19,8 @@
#include <sys/socket.h>
#include <sys/un.h>
/* include from 'src/base/ipc' */
#include <socket_descriptor_registry.h>
/* base-internal includes */
#include <base/internal/socket_descriptor_registry.h>
/* core-local includes */
#include <resource_path.h>

7
repos/base-linux/src/core/target.mk
View File

@ -31,11 +31,8 @@ SRC_CC = main.cc \
INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \
$(REP_DIR)/src/platform \
$(REP_DIR)/src/base/ipc \
$(REP_DIR)/src/base/env \
$(BASE_DIR)/src/base/env \
$(REP_DIR)/src/base/console \
$(BASE_DIR)/src/base/thread \
$(REP_DIR)/src/include \
$(BASE_DIR)/src/include
HOST_INC_DIR += /usr/include

0
repos/base-linux/src/base/env/context_area.h → repos/base-linux/src/include/base/internal/context_area.h
View File

0
repos/base-linux/src/base/console/core_console.h → repos/base-linux/src/include/base/internal/core_console.h
View File

0
repos/base-linux/src/base/lock/lock_helper.h → repos/base-linux/src/include/base/internal/lock_helper.h
View File

4
repos/base-linux/src/base/env/platform_env.h → repos/base-linux/src/include/base/internal/platform_env.h
View File

@ -27,8 +27,8 @@
#include <base/heap.h>
#include <linux_cpu_session/client.h>
/* local includes (from 'base/src/base/env/') */
#include <platform_env_common.h>
/* base-internal includes */
#include <base/internal/platform_env_common.h>
namespace Genode {

0
repos/base-linux/src/base/ipc/socket_descriptor_registry.h → repos/base-linux/src/include/base/internal/socket_descriptor_registry.h
View File

4
repos/base-nova/lib/mk/base-common.mk
View File

@ -23,9 +23,7 @@ SRC_CC += thread/myself.cc
SRC_CC += thread/context_allocator.cc env/cap_map.cc
SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

2
repos/base-nova/lib/mk/base.mk
View File

@ -13,7 +13,7 @@ SRC_CC += thread/thread_nova.cc
SRC_CC += irq/platform.cc
SRC_CC += server/rpc_cap_alloc.cc
INC_DIR += $(BASE_DIR)/src/base/env
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

5
repos/base-nova/src/core/target.inc
View File

@ -40,9 +40,8 @@ SRC_CC = context_area.cc \
trace_session_component.cc
INC_DIR = $(REP_DIR)/src/core/include \
$(REP_DIR)/src/base/console \
$(BASE_DIR)/src/base/thread \
$(BASE_DIR)/src/base/include \
$(REP_DIR)/src/include \
$(BASE_DIR)/src/include \
$(GEN_CORE_DIR)/include
include $(GEN_CORE_DIR)/version.inc

0
repos/base-nova/src/base/console/core_console.h → repos/base-nova/src/include/base/internal/core_console.h
View File

0
repos/base-nova/src/base/lock/lock_helper.h → repos/base-nova/src/include/base/internal/lock_helper.h
View File

4
repos/base-nova/src/base/lock/spin_lock.h → repos/base-nova/src/include/base/internal/spin_lock.h
View File

@ -19,8 +19,8 @@
#include <cpu/memory_barrier.h>
#include <base/thread.h>
/* local includes */
#include <lock_helper.h>
/* base-internal includes */
#include <base/internal/lock_helper.h>
enum State {

0
repos/base-nova/src/lib/startup/_main_parent_cap.h → repos/base-nova/src/include/startup/internal/_main_parent_cap.h
View File

4
repos/base-okl4/lib/mk/base-common.mk
View File

@ -24,9 +24,7 @@ SRC_CC += thread/myself.cc
SRC_CC += thread/context_allocator.cc
SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath cap_copy.cc $(BASE_DIR)/src/lib/startup
vpath %.cc $(REP_DIR)/src/base

2
repos/base-okl4/lib/mk/base.mk
View File

@ -8,6 +8,6 @@ SRC_CC += server/rpc_cap_alloc.cc
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base
INC_DIR += $(BASE_DIR)/src/base/env
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
LIBS += base-common

2
repos/base-okl4/lib/mk/boot_info.mk
View File

@ -1,5 +1,5 @@
SRC_C = bootinfo.c
INC_DIR += $(REP_DIR)/src/base/bootinfo
INC_DIR += $(REP_DIR)/src/include/bootinfo/internal
CC_WARN = -Wall -Wno-attributes
vpath bootinfo.c $(OKL4_DIR)/libs/bootinfo/src

7
repos/base-okl4/src/core/target.inc
View File

@ -37,11 +37,8 @@ SRC_CC += context_area.cc \
thread_start.cc \
trace_session_component.cc
INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \
$(REP_DIR)/src/base/console \
$(BASE_DIR)/src/base/thread \
$(BASE_DIR)/src/lib/startup
INC_DIR += $(REP_DIR)/src/core/include $(GEN_CORE_DIR)/include \
$(REP_DIR)/src/include $(BASE_DIR)/src/include
include $(GEN_CORE_DIR)/version.inc

0
repos/base-okl4/src/base/console/core_console.h → repos/base-okl4/src/include/base/internal/core_console.h
View File

0
repos/base-okl4/src/base/lock/lock_helper.h → repos/base-okl4/src/include/base/internal/lock_helper.h
View File

0
repos/base-okl4/src/base/bootinfo/stdint.h → repos/base-okl4/src/include/bootinfo/internal/stdint.h
View File

0
repos/base-okl4/src/base/bootinfo/stdio.h → repos/base-okl4/src/include/bootinfo/internal/stdio.h
View File

4
repos/base-pistachio/lib/mk/base-common.mk
View File

@ -24,9 +24,7 @@ SRC_CC += thread/myself.cc
SRC_CC += thread/context_allocator.cc
SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath cap_copy.cc $(BASE_DIR)/src/lib/startup
vpath %.cc $(REP_DIR)/src/base

2
repos/base-pistachio/lib/mk/base.mk
View File

@ -13,7 +13,7 @@ SRC_CC += thread/thread_start.cc
SRC_CC += irq/platform.cc
SRC_CC += server/rpc_cap_alloc.cc
INC_DIR += $(BASE_DIR)/src/base/env
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

9
repos/base-pistachio/src/core/cpu_session_platform.cc
View File

@ -13,19 +13,10 @@
/* Genode includes */
#include <cpu_session_component.h>
#include <pistachio/kip.h>
using namespace Genode;
using namespace Pistachio;
// unsigned int Cpu_session_component::available_cpus()
// {
// if (_pinned_cpu == -1)
// return L4_NumProcessors(get_kip());
// else
// return 1;
// }
Ram_dataspace_capability Cpu_session_component::utcb(Thread_capability thread_cap)
{
PERR("%s: Not implemented", __PRETTY_FUNCTION__);

4
repos/base-pistachio/src/core/include/ipc_pager.h
View File

@ -20,7 +20,9 @@
#include <base/ipc.h>
#include <base/stdint.h>
#include <util/touch.h>
#include <pistachio/kip.h>
/* core-local includes */
#include <kip.h>
/* Pistachio includes */
namespace Pistachio {

0
repos/base-pistachio/include/pistachio/kip.h → repos/base-pistachio/src/core/include/kip.h
View File

13
repos/base-pistachio/include/pistachio/thread_helper.h → repos/base-pistachio/src/core/include/print_l4_thread_id.h
View File

@ -1,5 +1,5 @@
/*
* \brief Pistachio-specific thread helper functions
* \brief Pistachio-specific thread helper
* \author Julian Stecklina
* \date 2008-02-20
*/
@ -11,16 +11,15 @@
* under the terms of the GNU General Public License version 2.
*/
#ifndef _INCLUDE__PISTACHIO__THREAD_HELPER_H_
#define _INCLUDE__PISTACHIO__THREAD_HELPER_H_
#ifndef _INCLUDE__PISTACHIO__PRINT_L4_THREAD_ID_
#define _INCLUDE__PISTACHIO__PRINT_L4_THREAD_ID_
#include <base/printf.h>
namespace Pistachio
{
namespace Pistachio {
#include <l4/types.h>
inline void print_l4_threadid(L4_ThreadId_t t)
inline void print_l4_thread_id(L4_ThreadId_t t)
{
if (L4_IsLocalId(t)) {
Genode::printf("THREAD (local) %02lx (raw %08lx)\n",
@ -42,4 +41,4 @@ namespace Pistachio
}
}
#endif /* _INCLUDE__PISTACHIO__THREAD_HELPER_H_ */
#endif /* _INCLUDE__PISTACHIO__PRINT_L4_THREAD_ID_ */

4
repos/base-pistachio/src/core/include/util.h
View File

@ -19,9 +19,11 @@
#include <base/printf.h>
#include <rm_session/rm_session.h>
#include <util/touch.h>
#include <pistachio/kip.h>
#include <base/native_types.h>
/* core-local includes */
#include <kip.h>
/* Pistachio includes */
namespace Pistachio {
#include <l4/types.h>

2
repos/base-pistachio/src/core/io_mem_session_support.cc
View File

@ -13,10 +13,10 @@
*/
/* core includes */
#include <pistachio/kip.h>
#include <platform.h>
#include <util.h>
#include <io_mem_session_component.h>
#include <kip.h>
/* Pistachio includes */
namespace Pistachio {

3
repos/base-pistachio/src/base/kip/kip.cc → repos/base-pistachio/src/core/kip.cc
View File

@ -11,7 +11,8 @@
* under the terms of the GNU General Public License version 2.
*/
#include <pistachio/kip.h>
/* core-local includes */
#include <kip.h>
using namespace Pistachio;

2
repos/base-pistachio/src/core/multiboot_info.cc
View File

@ -15,10 +15,10 @@
#include <base/printf.h>
#include <multiboot.h>
#include <util/misc_math.h>
#include <pistachio/kip.h>
/* core includes */
#include <util.h>
#include <kip.h>
/* Pistachio includes */
namespace Pistachio {

12
repos/base-pistachio/src/core/platform.cc
View File

@ -26,8 +26,8 @@
#include <platform_thread.h>
#include <platform_pd.h>
#include <util.h>
#include <pistachio/thread_helper.h>
#include <pistachio/kip.h>
#include <kip.h>
#include <print_l4_thread_id.h>
/* Pistachio includes */
namespace Pistachio {
@ -161,13 +161,13 @@ static void _core_pager_loop()
PDBG("Got page fault (pf_addr = %08lx, pf_ip = %08lx, flags = %08lx).",
pf_addr, pf_ip, flags);
print_l4_threadid(L4_GlobalId(t));
print_l4_thread_id(L4_GlobalId(t));
/* check for NULL pointer */
if (pf_addr < page_size) {
PERR("possible null pointer %s at address %lx at EIP %lx in",
is_write_fault(flags) ? "WRITE" : "READ/EXEC", pf_addr, pf_ip);
print_l4_threadid(t);
print_l4_thread_id(t);
/* do not unblock faulter */
break;
} else if (!_core_address_ranges().valid_addr(pf_addr)) {
@ -175,12 +175,12 @@ static void _core_pager_loop()
PERR("%s access outside of RAM at %lx IP %lx",
is_write_fault(flags) ? "WRITE" : "READ", pf_addr, pf_ip);
print_l4_threadid(t);
print_l4_thread_id(t);
/* do not unblock faulter */
break;
} else if (verbose_core_pf) {
PDBG("pfa=%lx ip=%lx in", pf_addr, pf_ip);
print_l4_threadid(t);
print_l4_thread_id(t);
}
/* my pf handler is sigma0 - just touch the appropriate page */

3
repos/base-pistachio/src/core/platform_thread.cc
View File

@ -14,12 +14,11 @@
/* Genode includes */
#include <base/printf.h>
#include <util/string.h>
#include <pistachio/thread_helper.h>
#include <pistachio/kip.h>
/* core includes */
#include <platform_pd.h>
#include <platform_thread.h>
#include <kip.h>
/* Pistachio includes */
namespace Pistachio

4
repos/base-pistachio/src/core/spec/x86/platform_x86.cc
View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2.
*/
#include <pistachio/thread_helper.h>
#include <pistachio/kip.h>
/* core-local includes */
#include <kip.h>
#include "platform.h"
#include "util.h"

6
repos/base-pistachio/src/core/target.inc
View File

@ -37,10 +37,8 @@ SRC_CC = context_area.cc \
thread_start.cc \
trace_session_component.cc
INC_DIR += $(REP_DIR)/src/core/include \
$(REP_DIR)/src/base/console \
$(BASE_DIR)/src/base/thread \
$(GEN_CORE_DIR)/include
INC_DIR += $(REP_DIR)/src/core/include $(GEN_CORE_DIR)/include \
$(REP_DIR)/src/include $(BASE_DIR)/src/include
include $(GEN_CORE_DIR)/version.inc

0
repos/base-pistachio/src/base/console/core_console.h → repos/base-pistachio/src/include/base/internal/core_console.h
View File

0
repos/base-pistachio/src/base/lock/lock_helper.h → repos/base-pistachio/src/include/base/internal/lock_helper.h
View File

4
repos/base-sel4/lib/mk/base-common.inc
View File

@ -26,9 +26,7 @@ SRC_CC += thread/thread_bootstrap.cc
SRC_CC += env/capability.cc
SRC_CC += sleep.cc
INC_DIR += $(REP_DIR)/src/base
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/thread
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

3
repos/base-sel4/lib/mk/base.mk
View File

@ -13,8 +13,7 @@ SRC_CC += thread/thread_start.cc thread/thread_init.cc
SRC_CC += irq/platform.cc
SRC_CC += server/rpc_cap_alloc.cc
INC_DIR += $(REP_DIR)/src/base
INC_DIR += $(BASE_DIR)/src/base/env
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

6
repos/base-sel4/lib/mk/core.mk
View File

@ -37,10 +37,8 @@ SRC_CC += \
LIBS += core_printf base-common syscall
INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \
$(REP_DIR)/src/base \
$(BASE_DIR)/src/base/thread
INC_DIR += $(REP_DIR)/src/core/include $(GEN_CORE_DIR)/include \
$(REP_DIR)/src/include $(BASE_DIR)/src/include
include $(GEN_CORE_DIR)/version.inc

2
repos/base-sel4/lib/mk/core_printf.mk
View File

@ -1,5 +1,5 @@
SRC_CC = core_printf.cc
INC_DIR += $(REP_DIR)/src/base/console
INC_DIR += $(REP_DIR)/src/include
LIBS += syscall
vpath core_printf.cc $(BASE_DIR)/src/base/console

6
repos/base-sel4/lib/mk/spec/x86_32/startup.mk
View File

@ -1,9 +1,9 @@
#
# Make the includes of src/base/internal/ available to the startup lib. This is
# Make the includes of src/base/include/ available to the startup lib. This is
# needed because the seL4-specific src/platform/_main_parent_cap.h as included
# by the startup lib depends on the internal/capability_space_sel4.h.
# by the startup lib depends on base/internal/capability_space_sel4.h.
#
INC_DIR += $(REP_DIR)/src/base
INC_DIR += $(REP_DIR)/src/include $(BASE_DIR)/src/include
include $(BASE_DIR)/lib/mk/startup.inc

4
repos/base-sel4/src/base/env/capability.cc vendored
View File

@ -15,8 +15,8 @@
#include <base/printf.h>
/* base-internal includes */
#include <internal/native_types.h>
#include <internal/capability_space.h>
#include <base/internal/native_types.h>
#include <base/internal/capability_space.h>
using namespace Genode;

4
repos/base-sel4/src/base/env/capability_space.cc vendored
View File

@ -16,8 +16,8 @@
#include <base/printf.h>
/* base-internal includes */
#include <internal/capability_data.h>
#include <internal/capability_space_sel4.h>
#include <base/internal/capability_data.h>
#include <base/internal/capability_space_sel4.h>
/**
* Definition of capability meta data

4
repos/base-sel4/src/base/ipc/ipc.cc
View File

@ -19,8 +19,8 @@
#include <util/misc_math.h>
/* base-internal includes */
#include <internal/capability_space_sel4.h>
#include <internal/kernel_debugger.h>
#include <base/internal/capability_space_sel4.h>
#include <base/internal/kernel_debugger.h>
/* seL4 includes */
#include <sel4/sel4.h>

4
repos/base-sel4/src/base/server/server.cc
View File

@ -17,9 +17,11 @@
*/
/* Genode includes */
#include <internal/capability_space_sel4.h>
#include <base/rpc_server.h>
/* base-internal includes */
#include <base/internal/capability_space_sel4.h>
using namespace Genode;

4
repos/base-sel4/src/core/capability_space.cc
View File

@ -16,8 +16,8 @@
#include <base/printf.h>
/* base-internal includes */
#include <internal/capability_data.h>
#include <internal/capability_space_sel4.h>
#include <base/internal/capability_data.h>
#include <base/internal/capability_space_sel4.h>
/* core includes */
#include <core_capability_space.h>

2
repos/base-sel4/src/core/include/cap_sel_alloc.h
View File

@ -18,7 +18,7 @@
#include <base/exception.h>
/* base-internal includes */
#include <internal/capability_space_sel4.h>
#include <base/internal/capability_space_sel4.h>
namespace Genode { struct Cap_sel_alloc; }

2
repos/base-sel4/src/core/include/core_capability_data.h
View File

@ -15,7 +15,7 @@
#define _CORE__INCLUDE__CAPABILITY_CORE_DATA_H_
/* base-internal includes */
#include <internal/capability_data.h>
#include <base/internal/capability_data.h>
namespace Genode {

2
repos/base-sel4/src/core/include/core_capability_space.h
View File

@ -15,7 +15,7 @@
#define _CORE__INCLUDE__CORE_CAPABILITY_SPACE_H_
/* base-internal includes */
#include <internal/rpc_obj_key.h>
#include <base/internal/rpc_obj_key.h>
namespace Genode { class Pd_session; }

2
repos/base-sel4/src/core/include/platform_pd.h
View File

@ -23,7 +23,7 @@
#include <vm_space.h>
/* base-internal includes */
#include <internal/capability_space_sel4.h>
#include <base/internal/capability_space_sel4.h>
namespace Genode { class Platform_pd; }

2
repos/base-sel4/src/core/include/thread_sel4.h
View File

@ -21,7 +21,7 @@
#include <base/printf.h>
/* base-internal includes */
#include <internal/assert.h>
#include <base/internal/assert.h>
/* core includes */
#include <map_local.h>

2
repos/base-sel4/src/core/pager.cc
View File

@ -20,7 +20,7 @@
#include <install_mapping.h>
/* base-internal includes */
#include <internal/capability_space_sel4.h>
#include <base/internal/capability_space_sel4.h>
/* seL4 includes */
#include <sel4/sel4.h>

2
repos/base-sel4/src/core/platform_pd.cc
View File

@ -22,7 +22,7 @@
#include <kernel_object.h>
/* base-internal includes */
#include <internal/capability_space_sel4.h>
#include <base/internal/capability_space_sel4.h>
using namespace Genode;

2
repos/base-sel4/src/core/platform_thread.cc
View File

@ -20,7 +20,7 @@
#include <platform_pd.h>
/* base-internal includes */
#include <internal/capability_space_sel4.h>
#include <base/internal/capability_space_sel4.h>
using namespace Genode;

2
repos/base-sel4/src/base/internal/assert.h → repos/base-sel4/src/include/base/internal/assert.h
View File

@ -21,7 +21,7 @@
#include <base/snprintf.h>
/* base-internal includes */
#include <internal/kernel_debugger.h>
#include <base/internal/kernel_debugger.h>
#define ASSERT(e) \
do { if (!(e)) { \

2
repos/base-sel4/src/base/internal/capability_data.h → repos/base-sel4/src/include/base/internal/capability_data.h
View File

@ -19,7 +19,7 @@
#include <util/avl_tree.h>
/* base-internal includes */
#include <internal/rpc_obj_key.h>
#include <base/internal/rpc_obj_key.h>
namespace Genode { class Capability_data; }

2
repos/base-sel4/src/base/internal/capability_space.h → repos/base-sel4/src/include/base/internal/capability_space.h
View File

@ -23,7 +23,7 @@
#include <base/thread.h>
/* base-internal includes */
#include <internal/capability_data.h>
#include <base/internal/capability_data.h>
namespace Genode { namespace Capability_space {

4
repos/base-sel4/src/base/internal/capability_space_sel4.h → repos/base-sel4/src/include/base/internal/capability_space_sel4.h
View File

@ -19,8 +19,8 @@
#include <base/lock.h>
/* base-internal includes */
#include <internal/capability_space.h>
#include <internal/assert.h>
#include <base/internal/capability_space.h>
#include <base/internal/assert.h>
namespace Genode {

Some files were not shown because too many files have changed in this diff Show More