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

Merge base libraries into a single library 

This patch simplifies the way of how Genode's base libraries are
organized. Originally, the base API was implemented in the form of many
small libraries such as 'thread', 'env', 'server', etc. Most of them
used to consist of only a small number of files. Because those libraries
are incorporated in any build, the checking of their inter-dependencies
made the build process more verbose than desired. Also, the number of
libraries and their roles (core only, non-core only, shared by both core
and non-core) were not easy to capture.

Hereby, the base libraries have been reduced to the following few
libraries:

- startup.mk contains the startup code for normal Genode processes.
  On some platform, core is able to use the library as well.
- base-common.mk contains the parts of the base library that are
  identical by core and non-core processes.
- base.mk contains the complete base API implementation for non-core
  processes

Consequently, the 'LIBS' declaration in 'target.mk' files becomes
simpler as well. In the most simple case, only the 'base' library must
be mentioned.

Fixes #18
devel
Norman Feske 2013-02-14 12:39:51 +01:00
parent 4c3d49459b
commit fae63f4fa9
328 changed files with 779 additions and 949 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
base-codezero/lib/mk/arm/startup.mk
View File

@ -1,9 +0,0 @@
LIBS = cxx lock l4
SRC_S = crt0.s
SRC_CC = _main.cc
INC_DIR += $(REP_DIR)/src/platform
INC_DIR += $(BASE_DIR)/src/platform
INC_DIR += $(REP_DIR)/include/codezero/dummies
vpath crt0.s $(BASE_DIR)/src/platform/arm
vpath _main.cc $(dir $(call select_from_repositories,src/platform/_main.cc))

32
base-codezero/lib/mk/base-common.mk Normal file
View File

@ -0,0 +1,32 @@
#
# \brief Portions of base library shared by core and non-core processes
# \author Norman Feske
# \date 2013-02-14
#
LIBS += cxx l4 startup
SRC_CC += cap_copy.cc
SRC_CC += ipc/ipc.cc ipc/pager.cc ipc/ipc_marshal_cap.cc
SRC_CC += pager/pager.cc
SRC_CC += avl_tree/avl_tree.cc
SRC_CC += allocator/slab.cc
SRC_CC += allocator/allocator_avl.cc
SRC_CC += heap/heap.cc heap/sliced_heap.cc
SRC_CC += console/console.cc
SRC_CC += child/child.cc
SRC_CC += process/process.cc
SRC_CC += elf/elf_binary.cc
SRC_CC += lock/lock.cc
SRC_CC += signal/signal.cc
SRC_CC += server/server.cc server/common.cc
SRC_CC += thread/thread.cc thread/thread_bootstrap_empty.cc
SRC_CC += env/utcb.cc
SRC_CC += lock/cmpxchg.cc
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(REP_DIR)/include/codezero/dummies
vpath cap_copy.cc $(BASE_DIR)/src/platform
vpath %.cc $(BASE_DIR)/src/base
vpath %.cc $(REP_DIR)/src/base

12
base-codezero/lib/mk/base.mk Normal file
View File

@ -0,0 +1,12 @@
SRC_CC += console/log_console.cc
SRC_CC += env/env.cc env/context_area.cc env/reload_parent_cap.cc
SRC_CC += thread/thread_start.cc
INC_DIR += $(BASE_DIR)/src/base/env
INC_DIR += $(REP_DIR)/include/codezero/dummies
LIBS += base-common
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

13
base-codezero/lib/mk/cxx.mk
View File

@ -1,13 +0,0 @@
#
# Additional symbols we need to keep when using the arm-none-linux-gnueabi
# tool chain
#
KEEP_SYMBOLS += __aeabi_ldivmod __aeabi_uldivmod __dynamic_cast
KEEP_SYMBOLS += _ZN10__cxxabiv121__vmi_class_type_infoD0Ev
#
# Override sources of the base repository with our changed version
#
vpath exception.cc $(REP_DIR)/src/base/cxx
include $(BASE_DIR)/lib/mk/cxx.mk

6
base-codezero/lib/mk/env.mk
View File

@ -1,6 +0,0 @@
include $(BASE_DIR)/lib/mk/env.mk
SRC_CC += utcb.cc
vpath utcb.cc $(REP_DIR)/src/base/env
vpath env.cc $(BASE_DIR)/src/base/env

6
base-codezero/lib/mk/ipc.mk
View File

@ -1,6 +0,0 @@
SRC_CC = ipc.cc pager.cc ipc_marshal_cap.cc
INC_DIR += $(REP_DIR)/include/codezero/dummies
LIBS = cap_copy
vpath %.cc $(REP_DIR)/src/base/ipc
vpath ipc_marshal_cap.cc $(BASE_DIR)/src/base/ipc

7
base-codezero/lib/mk/lock.mk
View File

@ -1,7 +0,0 @@
SRC_CC = lock.cc cmpxchg.cc
INC_DIR += $(REP_DIR)/include/codezero/dummies
INC_DIR += $(REP_DIR)/src/base/lock
vpath lock.cc $(BASE_DIR)/src/base/lock
vpath cmpxchg.cc $(REP_DIR)/src/base/lock

4
base-codezero/lib/mk/pager.mk
View File

@ -1,4 +0,0 @@
SRC_CC = pager.cc
INC_DIR += $(REP_DIR)/include/codezero/dummies
vpath pager.cc $(REP_DIR)/src/base/pager

1
base-codezero/lib/mk/pl011/core_printf.mk
View File

@ -1,5 +1,4 @@
SRC_CC = core_printf.cc
LIBS = cxx console
INC_DIR += $(REP_DIR)/src/base/console/pl011
INC_DIR += $(REP_DIR)/include/codezero/dummies

5
base-codezero/lib/mk/startup.mk Normal file
View File

@ -0,0 +1,5 @@
include $(BASE_DIR)/lib/mk/startup.inc
INC_DIR += $(REP_DIR)/include/codezero/dummies
vpath crt0.s $(BASE_DIR)/src/platform/arm

5
base-codezero/lib/mk/thread.mk
View File

@ -1,5 +0,0 @@
SRC_CC = thread.cc thread_start.cc thread_bootstrap.cc
INC_DIR += $(REP_DIR)/include/codezero/dummies
vpath thread_start.cc $(REP_DIR)/src/base/thread
vpath %.cc $(BASE_DIR)/src/base/thread

5
base-codezero/mk/spec-codezero.mk
View File

@ -34,11 +34,6 @@ INC_DIR += $(CODEZERO_ABS_DIR)/include
INC_DIR += $(CODEZERO_ABS_DIR)/conts/userlibs/libl4/include
INC_DIR += $(CODEZERO_ABS_DIR)/conts/userlibs/libdev/uart/include
#
# Codezero-specific startup code
#
PRG_LIBS += startup
#
# Allow programs to test for the Codezero kernel
#

16
base-codezero/src/core/target.inc
View File

@ -1,10 +1,8 @@
TARGET = core
LIBS = cxx ipc heap core_printf child pager lock \
raw_signal raw_server
GEN_CORE_DIR = $(BASE_DIR)/src/core
SRC_CC = \
SRC_CC += \
main.cc \
ram_session_component.cc \
ram_session_support.cc \
@ -14,9 +12,7 @@ SRC_CC = \
pd_session_component.cc \
io_mem_session_component.cc \
io_mem_session_support.cc \
thread.cc \
thread_start.cc \
thread_bootstrap.cc \
platform_thread.cc \
platform_pd.cc \
platform_services.cc \
@ -30,10 +26,11 @@ SRC_CC = \
core_rm_session.cc \
core_mem_alloc.cc \
dump_alloc.cc \
context_area.cc \
utcb.cc
context_area.cc
INC_DIR = $(REP_DIR)/src/core/include \
LIBS += core_printf base-common
INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \
$(REP_DIR)/include/codezero/dummies
@ -53,6 +50,3 @@ vpath core_mem_alloc.cc $(GEN_CORE_DIR)
vpath dump_alloc.cc $(GEN_CORE_DIR)
vpath context_area.cc $(GEN_CORE_DIR)
vpath %.cc $(REP_DIR)/src/core
vpath thread_bootstrap.cc $(BASE_DIR)/src/base/thread
vpath thread.cc $(BASE_DIR)/src/base/thread
vpath utcb.cc $(REP_DIR)/src/base/env

6
base-fiasco/lib/mk/arm/platform.mk Normal file
View File

@ -0,0 +1,6 @@
#
# Configuration for L4 build system (for kernel-bindings, sigma0, bootstrap).
#
L4_CONFIG = $(REP_DIR)/config/l4env-config.x86
include $(REP_DIR)/lib/mk/platform.inc

8
base-fiasco/lib/mk/arm/startup.mk
View File

@ -1,8 +0,0 @@
REQUIRES = fiasco arm
LIBS = cxx lock
SRC_S = crt0.s
SRC_CC = _main.cc
INC_DIR += $(REP_DIR)/src/platform
vpath crt0.s $(REP_DIR)/src/platform/arm
vpath _main.cc $(dir $(call select_from_repositories,src/platform/_main.cc))

29
base-fiasco/lib/mk/base-common.mk Normal file
View File

@ -0,0 +1,29 @@
#
# \brief Portions of base library shared by core and non-core processes
# \author Norman Feske
# \date 2013-02-14
#
LIBS += cxx startup
SRC_CC += cap_copy.cc
SRC_CC += ipc/ipc.cc ipc/pager.cc ipc/ipc_marshal_cap.cc
SRC_CC += pager/pager.cc
SRC_CC += avl_tree/avl_tree.cc
SRC_CC += allocator/slab.cc
SRC_CC += allocator/allocator_avl.cc
SRC_CC += heap/heap.cc heap/sliced_heap.cc
SRC_CC += console/console.cc
SRC_CC += child/child.cc
SRC_CC += process/process.cc
SRC_CC += elf/elf_binary.cc
SRC_CC += lock/lock.cc
SRC_CC += signal/signal.cc
SRC_CC += server/server.cc server/common.cc
SRC_CC += thread/thread.cc thread/thread_bootstrap_empty.cc
INC_DIR += $(REP_DIR)/src/base/lock
vpath cap_copy.cc $(BASE_DIR)/src/platform
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

16
base-fiasco/lib/mk/base.mk Normal file
View File

@ -0,0 +1,16 @@
#
# \brief Portions of base library that are exclusive to non-core processes
# \author Norman Feske
# \date 2013-02-14
#
LIBS += base-common
SRC_CC += console/log_console.cc
SRC_CC += env/env.cc env/context_area.cc env/reload_parent_cap.cc
SRC_CC += thread/thread_start.cc
INC_DIR += $(BASE_DIR)/src/base/env
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

5
base-fiasco/lib/mk/core_printf.mk
View File

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

5
base-fiasco/lib/mk/ipc.mk
View File

@ -1,5 +0,0 @@
SRC_CC = ipc.cc pager.cc ipc_marshal_cap.cc
LIBS = cap_copy
vpath %.cc $(REP_DIR)/src/base/ipc
vpath ipc_marshal_cap.cc $(BASE_DIR)/src/base/ipc

3
base-fiasco/lib/mk/lock.mk
View File

@ -1,3 +0,0 @@
SRC_CC = lock.cc
vpath lock.cc $(REP_DIR)/src/base/lock

3
base-fiasco/lib/mk/pager.mk
View File

@ -1,3 +0,0 @@
SRC_CC = pager.cc
vpath pager.cc $(REP_DIR)/src/base/pager

8
base-fiasco/lib/mk/x86/startup.mk
View File

@ -1,8 +0,0 @@
REQUIRES = fiasco x86
LIBS = cxx lock
SRC_S = crt0.s
SRC_CC = _main.cc
INC_DIR += $(BASE_DIR)/src/platform $(REP_DIR)/src/platform
vpath crt0.s $(dir $(call select_from_repositories,src/platform/x86_32/crt0.s))
vpath _main.cc $(dir $(call select_from_repositories,src/platform/_main.cc))

7
base-fiasco/mk/spec-fiasco.mk
View File

@ -13,19 +13,12 @@
L4_BUILD_DIR ?= $(BUILD_BASE_DIR)/l4
L4_SRC_DIR ?= $(REP_DIR)/contrib/fiasco/snapshot
#
# L4/sys headers
#
L4_INC_DIR += $(L4_BUILD_DIR)/include \
$(L4_BUILD_DIR)/include/l4v2
#
# Startup code to be used when building a program
#
STARTUP_LIB ?= startup
PRG_LIBS += $(STARTUP_LIB)
clean_contrib:
$(VERBOSE)rm -rf $(BUILD_BASE_DIR)/l4

17
base-fiasco/src/core/target.inc
View File

@ -1,10 +1,8 @@
TARGET = core
REQUIRES = fiasco
LIBS = cxx ipc heap core_printf child pager lock raw_signal raw_server
GEN_CORE_DIR = $(BASE_DIR)/src/core
SRC_CC = main.cc \
SRC_CC += main.cc \
multiboot_info.cc \
ram_session_component.cc \
ram_session_support.cc \
@ -14,9 +12,7 @@ SRC_CC = main.cc \
pd_session_component.cc \
io_mem_session_component.cc \
io_mem_session_support.cc \
thread.cc \
thread_start.cc \
thread_bootstrap.cc \
platform_thread.cc \
platform_pd.cc \
platform_services.cc \
@ -29,10 +25,14 @@ SRC_CC = main.cc \
signal_session_component.cc \
signal_source_component.cc \
dump_alloc.cc \
context_area.cc
context_area.cc \
core_printf.cc
INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include
$(GEN_CORE_DIR)/include \
$(REP_DIR)/src/base/console
LIBS += base-common
vpath main.cc $(GEN_CORE_DIR)
vpath multiboot_info.cc $(GEN_CORE_DIR)
@ -48,6 +48,5 @@ vpath signal_source_component.cc $(GEN_CORE_DIR)
vpath dataspace_component.cc $(GEN_CORE_DIR)
vpath dump_alloc.cc $(GEN_CORE_DIR)
vpath context_area.cc $(GEN_CORE_DIR)
vpath thread_bootstrap.cc $(BASE_DIR)/src/base/thread
vpath thread.cc $(BASE_DIR)/src/base/thread
vpath core_printf.cc $(BASE_DIR)/src/base/console
vpath %.cc $(REP_DIR)/src/core

3
base-foc/lib/mk/arm/base-common.mk Normal file
View File

@ -0,0 +1,3 @@
include $(REP_DIR)/lib/mk/base-common.inc
SRC_CC += ipc/arm/pager.cc ipc/arm/pager_exception.cc

4
base-foc/lib/mk/arm/ipc.mk
View File

@ -1,4 +0,0 @@
SRC_CC = arm/pager_exception.cc arm/pager.cc
include $(REP_DIR)/lib/mk/ipc.inc

8
base-foc/lib/mk/arm/startup.mk
View File

@ -1,8 +0,0 @@
SRC_S = crt0.s
SRC_CC = _main.cc
LIBS += cxx lock
INC_DIR += $(REP_DIR)/src/platform $(BASE_DIR)/src/platform
vpath crt0.s $(BASE_DIR)/src/platform/arm
vpath _main.cc $(BASE_DIR)/src/platform

0
base-foc/lib/mk/arm/syscalls.mk → base-foc/lib/mk/arm/syscall.mk
View File

28
base-foc/lib/mk/base-common.inc Normal file
View File

@ -0,0 +1,28 @@
#
# \brief Portions of base library shared by core and non-core processes
# \author Norman Feske
# \date 2013-02-14
#
LIBS += cxx syscall startup
SRC_CC += ipc/ipc.cc ipc/pager.cc
SRC_CC += pager/pager.cc
SRC_CC += avl_tree/avl_tree.cc
SRC_CC += allocator/slab.cc
SRC_CC += allocator/allocator_avl.cc
SRC_CC += heap/heap.cc heap/sliced_heap.cc
SRC_CC += console/console.cc
SRC_CC += child/child.cc
SRC_CC += process/process.cc
SRC_CC += elf/elf_binary.cc
SRC_CC += lock/lock.cc
SRC_CC += env/spin_lock.cc env/cap_map.cc
SRC_CC += signal/signal.cc
SRC_CC += server/server.cc server/common.cc
SRC_CC += thread/thread.cc thread/thread_bootstrap.cc
INC_DIR += $(REP_DIR)/src/base/lock $(BASE_DIR)/src/base/lock
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

17
base-foc/lib/mk/base.mk Normal file
View File

@ -0,0 +1,17 @@
#
# \brief Portions of base library that are exclusive to non-core processes
# \author Norman Feske
# \date 2013-02-14
#
LIBS += base-common
SRC_CC += console/log_console.cc
SRC_CC += env/env.cc env/context_area.cc env/reload_parent_cap.cc \
env/cap_map_remove.cc env/cap_alloc.cc
SRC_CC += thread/thread_start.cc
INC_DIR += $(BASE_DIR)/src/base/env
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

5
base-foc/lib/mk/core_printf.mk
View File

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

13
base-foc/lib/mk/env.mk
View File

@ -1,13 +0,0 @@
SRC_CC = env.cc context_area.cc cap_map.cc cap_alloc.cc \
reload_parent_cap.cc spin_lock.cc cap_map_remove.cc
LIBS = ipc heap log_console lock
INC_DIR += $(REP_DIR)/src/base/lock $(BASE_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/base/env
vpath env.cc $(BASE_DIR)/src/base/env
vpath context_area.cc $(BASE_DIR)/src/base/env
vpath cap_map.cc $(REP_DIR)/src/base/env
vpath cap_map_remove.cc $(REP_DIR)/src/base/env
vpath cap_alloc.cc $(REP_DIR)/src/base/env
vpath spin_lock.cc $(REP_DIR)/src/base/env
vpath reload_parent_cap.cc $(BASE_DIR)/src/base/env

5
base-foc/lib/mk/ipc.inc
View File

@ -1,5 +0,0 @@
LIBS = syscalls
SRC_CC += ipc.cc pager.cc
INC_DIR += $(REP_DIR)/src/base/lock
vpath %.cc $(REP_DIR)/src/base/ipc

5
base-foc/lib/mk/lock.mk
View File

@ -1,5 +0,0 @@
SRC_CC = lock.cc
INC_DIR += $(REP_DIR)/src/base/lock
#INC_DIR += $(REP_DIR)/src/platform
vpath lock.cc $(BASE_DIR)/src/base/lock

3
base-foc/lib/mk/pager.mk
View File

@ -1,3 +0,0 @@
SRC_CC = pager.cc
vpath pager.cc $(REP_DIR)/src/base/pager

4
base-foc/lib/mk/raw_server.mk
View File

@ -1,4 +0,0 @@
SRC_CC = server.cc common.cc
vpath server.cc $(REP_DIR)/src/base/server
vpath common.cc $(BASE_DIR)/src/base/server

3
base-foc/lib/mk/server.mk
View File

@ -1,3 +0,0 @@
LIBS = thread
include $(REP_DIR)/lib/mk/raw_server.mk

3
base-foc/lib/mk/thread.mk
View File

@ -1,3 +0,0 @@
SRC_CC = thread.cc thread_start.cc thread_bootstrap.cc
vpath %.cc $(REP_DIR)/src/base/thread

0
base-foc/lib/mk/x86/syscalls.mk → base-foc/lib/mk/x86/syscall.mk
View File

3
base-foc/lib/mk/x86_32/base-common.mk Normal file
View File

@ -0,0 +1,3 @@
include $(REP_DIR)/lib/mk/base-common.inc
SRC_CC += ipc/x86_32/pager.cc ipc/x86/pager_exception.cc

3
base-foc/lib/mk/x86_32/ipc.mk
View File

@ -1,3 +0,0 @@
SRC_CC = x86/pager_exception.cc x86_32/pager.cc
include $(REP_DIR)/lib/mk/ipc.inc

8
base-foc/lib/mk/x86_32/startup.mk
View File

@ -1,8 +0,0 @@
SRC_S = crt0.s
SRC_CC = _main.cc
LIBS += cxx lock
INC_DIR += $(REP_DIR)/src/platform $(BASE_DIR)/src/platform
vpath crt0.s $(BASE_DIR)/src/platform/x86_32
vpath _main.cc $(BASE_DIR)/src/platform

3
base-foc/lib/mk/x86_64/base-common.mk Normal file
View File

@ -0,0 +1,3 @@
include $(REP_DIR)/lib/mk/base-common.inc
SRC_CC += ipc/x86_64/pager.cc ipc/x86/pager_exception.cc

3
base-foc/lib/mk/x86_64/ipc.mk
View File

@ -1,3 +0,0 @@
SRC_CC = x86/pager_exception.cc x86_64/pager.cc
include $(REP_DIR)/lib/mk/ipc.inc

8
base-foc/lib/mk/x86_64/startup.mk
View File

@ -1,8 +0,0 @@
SRC_S = crt0.s
SRC_CC = _main.cc
LIBS += cxx lock
INC_DIR += $(REP_DIR)/src/platform $(BASE_DIR)/src/platform
vpath crt0.s $(BASE_DIR)/src/platform/x86_64
vpath _main.cc $(BASE_DIR)/src/platform

6
base-foc/mk/spec-foc.mk
View File

@ -30,12 +30,6 @@ CC_OPT += -fPIC
#
CC_OPT += -DL4SYS_USE_UTCB_WRAP=1
#
# Startup code to be used when building a program
#
STARTUP_LIB ?= startup
PRG_LIBS += $(STARTUP_LIB)
all:
#

20
base-foc/src/core/target.inc
View File

@ -1,13 +1,13 @@
TARGET = core
REQUIRES = foc
LIBS = cxx ipc heap core_printf child pager lock raw_signal raw_server
LD_TEXT_ADDR = 0x500000
GEN_CORE_DIR = $(BASE_DIR)/src/core
SRC_CC = cap_map.cc \
cap_session_component.cc \
LIBS += base-common
SRC_CC = cap_session_component.cc \
context_area.cc \
cpu_session_component.cc \
cpu_session_extension.cc \
@ -31,15 +31,14 @@ SRC_CC = cap_map.cc \
rom_session_component.cc \
signal_session_component.cc \
signal_source_component.cc \
spin_lock.cc \
thread.cc \
thread_bootstrap.cc \
thread_start.cc
thread_start.cc \
core_printf.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/lock \
$(REP_DIR)/src/base/console
vpath context_area.cc $(GEN_CORE_DIR)
vpath cpu_session_component.cc $(GEN_CORE_DIR)
@ -54,8 +53,5 @@ vpath ram_session_component.cc $(GEN_CORE_DIR)
vpath rm_session_component.cc $(GEN_CORE_DIR)
vpath rom_session_component.cc $(GEN_CORE_DIR)
vpath signal_session_component.cc $(GEN_CORE_DIR)
vpath cap_map.cc $(REP_DIR)/src/base/env
vpath spin_lock.cc $(REP_DIR)/src/base/env
vpath thread.cc $(REP_DIR)/src/base/thread
vpath thread_bootstrap.cc $(REP_DIR)/src/base/thread
vpath core_printf.cc $(BASE_DIR)/src/base/console
vpath %.cc $(REP_DIR)/src/core

3
base-foc/src/core/x86/target.mk
View File

@ -1,10 +1,11 @@
include $(PRG_DIR)/../target.inc
REQUIRES += x86
SRC_CC += io_port_session_component.cc \
x86/platform_x86.cc
INC_DIR += $(REP_DIR)/src/core/include/x86
vpath io_port_session_component.cc $(GEN_CORE_DIR)/x86
vpath platform_services.cc $(GEN_CORE_DIR)/x86

2
base-foc/src/test/cap_integrity/target.mk
View File

@ -1,4 +1,4 @@
REQUIRES = foc
TARGET = test-cap_integrity
SRC_CC = main.cc
LIBS = env
LIBS = base

31
base-host/lib/mk/base-common.mk Normal file
View File

@ -0,0 +1,31 @@
#
# \brief Portions of base library shared by core and non-core processes
# \author Norman Feske
# \date 2013-02-14
#
LIBS += cxx
SRC_CC += cap_copy.cc
SRC_CC += ipc/ipc.cc ipc/ipc_marshal_cap.cc
SRC_CC += pager/pager.cc
SRC_CC += avl_tree/avl_tree.cc
SRC_CC += allocator/slab.cc
SRC_CC += allocator/allocator_avl.cc
SRC_CC += heap/heap.cc heap/sliced_heap.cc
SRC_CC += console/console.cc
SRC_CC += child/child.cc
SRC_CC += process/process.cc
SRC_CC += elf/elf_binary.cc
SRC_CC += lock/lock.cc
SRC_CC += signal/signal.cc
SRC_CC += server/server.cc server/common.cc
SRC_CC += thread/thread.cc thread/thread_bootstrap_empty.cc
INC_DIR += $(REP_DIR)/src/base/lock
INC_DIR += $(BASE_DIR)/src/platform $(REP_DIR)/src/platform
vpath cap_copy.cc $(BASE_DIR)/src/platform
vpath %.cc $(BASE_DIR)/src/base
vpath %.cc $(REP_DIR)/src/base

1
base-host/lib/mk/core_printf.mk
View File

@ -1 +0,0 @@
LIBS = printf_stdio console

4
base-host/lib/mk/cxx.mk Normal file
View File

@ -0,0 +1,4 @@
SRC_CC += new_delete.cc
vpath %.cc $(BASE_DIR)/src/base/cxx

7
base-host/lib/mk/env.mk
View File

@ -1,7 +0,0 @@
SRC_CC = env.cc parent.cc context_area.cc
LIBS = ipc heap lock log_console
INC_DIR += $(BASE_DIR)/src/base/env
vpath env.cc $(BASE_DIR)/src/base/env
vpath context_area.cc $(BASE_DIR)/src/base/env
vpath parent.cc $(REP_DIR)/src/base/env

5
base-host/lib/mk/ipc.mk
View File

@ -1,5 +0,0 @@
SRC_CC = ipc.cc ipc_marshal_cap.cc
LIBS = cap_copy
vpath ipc.cc $(REP_DIR)/src/base/ipc
vpath ipc_marshal_cap.cc $(BASE_DIR)/src/base/ipc

4
base-host/lib/mk/lock.mk
View File

@ -1,4 +0,0 @@
SRC_CC = lock.cc
INC_DIR += $(REP_DIR)/src/base/lock
vpath lock.cc $(BASE_DIR)/src/base/lock

3
base-host/lib/mk/pager.mk
View File

@ -1,3 +0,0 @@
SRC_CC = pager.cc
vpath pager.cc $(REP_DIR)/src/base/pager

0
base-foc/lib/mk/cap_copy.mk → base-host/lib/mk/platform.mk
View File

3
base-host/lib/mk/printf_stdio.mk
View File

@ -1,3 +0,0 @@
SRC_CC = printf_stdio.cc
vpath printf_stdio.cc $(REP_DIR)/src/lib/printf_stdio

11
base-host/src/core/target.inc
View File

@ -1,6 +1,5 @@
TARGET = core
LIBS = cxx ipc heap core_printf child pager lock \
raw_signal raw_server
LIBS = base-common
GEN_CORE_DIR = $(BASE_DIR)/src/core
@ -14,9 +13,7 @@ SRC_CC = \
pd_session_component.cc \
io_mem_session_component.cc \
io_mem_session_support.cc \
thread.cc \
thread_host.cc \
thread_bootstrap.cc \
platform_thread.cc \
platform_pd.cc \
platform.cc \
@ -28,7 +25,8 @@ SRC_CC = \
signal_session_component.cc \
signal_source_component.cc \
core_rm_session.cc \
context_area.cc
context_area.cc \
printf_stdio.cc
INC_DIR = $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include
@ -45,7 +43,6 @@ vpath signal_session_component.cc $(GEN_CORE_DIR)
vpath signal_source_component.cc $(GEN_CORE_DIR)
vpath dataspace_component.cc $(GEN_CORE_DIR)
vpath platform_services.cc $(GEN_CORE_DIR)
vpath printf_stdio.cc $(REP_DIR)/src/lib/printf_stdio
vpath %.cc $(REP_DIR)/src/core
vpath thread_bootstrap.cc $(BASE_DIR)/src/base/thread
vpath thread.cc $(BASE_DIR)/src/base/thread

22
base-hw/lib/mk/arm/startup.mk
View File

@ -1,22 +0,0 @@
#
# \brief Essential platform specific sources for common programs
# \author Martin Stein
# \date 2012-04-16
#
# add libraries
LIBS += cxx lock
# add C++ sources
SRC_CC += _main.cc
# add assembly sources
SRC_S += crt0.s syscall.cc
# add include paths
INC_DIR += $(REP_DIR)/src/platform $(BASE_DIR)/src/platform
# declare source paths
vpath crt0.s $(REP_DIR)/src/platform
vpath _main.cc $(BASE_DIR)/src/platform
vpath syscall.cc $(REP_DIR)/src/base/arm

26
base-hw/lib/mk/base-common.mk Normal file
View File

@ -0,0 +1,26 @@
#
# \brief Portions of base library shared by core and non-core processes
# \author Norman Feske
# \date 2013-02-14
#
LIBS += cxx syscall
SRC_CC += ipc.cc ipc/ipc_marshal_cap
SRC_CC += avl_tree/avl_tree.cc
SRC_CC += allocator/slab.cc
SRC_CC += allocator/allocator_avl.cc
SRC_CC += heap/heap.cc heap/sliced_heap.cc
SRC_CC += child/child.cc
SRC_CC += process/process.cc
SRC_CC += elf/elf_binary.cc
SRC_CC += console/console.cc
SRC_CC += lock/lock.cc
SRC_CC += signal/signal.cc
SRC_CC += server/server.cc server/common.cc
SRC_CC += thread/thread_bootstrap_empty.cc
INC_DIR += $(REP_DIR)/src/base/lock $(BASE_DIR)/src/base/lock
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

16
base-hw/lib/mk/base.mk Normal file
View File

@ -0,0 +1,16 @@
#
# \brief Portions of base library that are exclusive to non-core processes
# \author Norman Feske
# \date 2013-02-14
#
LIBS += base-common startup
SRC_CC += console/log_console.cc
SRC_CC += env/env.cc env/context_area.cc env/reload_parent_cap.cc
SRC_CC += thread/thread.cc thread_support.cc
INC_DIR += $(BASE_DIR)/src/base/env
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

12
base-hw/lib/mk/ipc.mk
View File

@ -1,12 +0,0 @@
#
# \brief Interprocess communication
# \author Martin Stein
# \date 2012-04-16
#
# add library dependencies
LIBS += thread
# include implied libraries
include $(REP_DIR)/lib/mk/raw_ipc.mk

15
base-hw/lib/mk/lock.mk
View File

@ -1,15 +0,0 @@
#
# \brief Synchronisation through locks
# \author Martin Stein
# \date 2012-04-16
#
# add C++ sources
SRC_CC += lock.cc
# add include paths
INC_DIR += $(REP_DIR)/src/base/lock
# declare source paths
vpath lock.cc $(BASE_DIR)/src/base/lock

12
base-hw/lib/mk/pager.mk
View File

@ -1,12 +0,0 @@
#
# \brief Genode pager threads
# \author Martin Stein
# \date 2012-04-16
#
# add C++ sources
SRC_CC += pager.cc
# declare source paths
vpath pager.cc $(REP_DIR)/src/base

13
base-hw/lib/mk/raw_ipc.mk
View File

@ -1,13 +0,0 @@
#
# \brief Inter-process communication without thread implementations
# \author Martin Stein
# \date 2012-04-16
#
# add C++ source files
SRC_CC += ipc.cc ipc_marshal_cap.cc
# declare source paths
vpath ipc.cc $(REP_DIR)/src/base
vpath ipc_marshal_cap.cc $(BASE_DIR)/src/base/ipc

15
base-hw/lib/mk/raw_signal.mk
View File

@ -1,15 +0,0 @@
#
# \brief Submit and receive asynchronous events
# \author Martin Stein
# \date 2012-05-07
#
# add C++ sources
SRC_CC += signal.cc
# add library dependencies
LIBS += slab
# declare source paths
vpath signal.cc $(REP_DIR)/src/base/signal

9
base-hw/lib/mk/signal.mk
View File

@ -1,9 +0,0 @@
#
# \brief Shortcut for raw-signal lib to ensure Genode compliance
# \author Martin Stein
# \date 2012-04-16
#
# include implied libraries
include $(REP_DIR)/lib/mk/raw_signal.mk

3
base-hw/lib/mk/syscall.mk Normal file
View File

@ -0,0 +1,3 @@
SRC_CC = syscall.cc
vpath syscall.cc $(REP_DIR)/src/base/arm

14
base-hw/lib/mk/thread.mk
View File

@ -1,14 +0,0 @@
#
# \brief Implementation of the Genode thread-API
# \author Martin Stein
# \date 2012-04-16
#
# add C++ sources
SRC_CC += thread.cc thread_bootstrap.cc thread_support.cc
# declare source paths
vpath thread_support.cc $(REP_DIR)/src/base/
vpath thread_bootstrap.cc $(BASE_DIR)/src/base/thread/
vpath thread.cc $(BASE_DIR)/src/base/thread/

10
base-hw/mk/spec-hw.mk
View File

@ -1,10 +0,0 @@
#
# \brief Build config for targets with hw spec
# \author Martin Stein
# \date 2012-04-16
#
# use the default startup lib if not set already
STARTUP_LIB ?= startup
PRG_LIBS += $(STARTUP_LIB)

4
base-hw/src/core/imx31/target.mk
View File

@ -12,8 +12,7 @@ INC_DIR += $(REP_DIR)/src/core/imx31
# add C++ sources
SRC_CC += platform_services.cc \
platform_support.cc \
syscall.cc
platform_support.cc
# add assembly sources
SRC_S += mode_transition.s \
@ -24,7 +23,6 @@ SRC_S += mode_transition.s \
vpath platform_services.cc $(BASE_DIR)/src/core
vpath platform_support.cc $(REP_DIR)/src/core/imx31
vpath mode_transition.s $(REP_DIR)/src/core/arm_v6
vpath syscall.cc $(REP_DIR)/src/base/arm
vpath crt0.s $(REP_DIR)/src/core/arm
#

4
base-hw/src/core/imx53/target.mk
View File

@ -13,8 +13,7 @@ INC_DIR += $(REP_DIR)/src/core/imx53
# add C++ sources
SRC_CC += platform_services.cc \
platform_support.cc \
syscall.cc
platform_support.cc
# add assembly sources
SRC_S += mode_transition.s \
@ -25,7 +24,6 @@ SRC_S += mode_transition.s \
vpath platform_services.cc $(BASE_DIR)/src/core
vpath platform_support.cc $(REP_DIR)/src/core/imx53
vpath mode_transition.s $(REP_DIR)/src/core/arm_v7
vpath syscall.cc $(REP_DIR)/src/base/arm
vpath crt0.s $(REP_DIR)/src/core/arm
#

4
base-hw/src/core/panda/target.mk
View File

@ -13,8 +13,7 @@ INC_DIR += $(REP_DIR)/src/core/panda
# add C++ sources
SRC_CC += platform_services.cc \
platform_support.cc \
syscall.cc
platform_support.cc
# add assembly sources
SRC_S += mode_transition.s \
@ -25,7 +24,6 @@ SRC_S += mode_transition.s \
vpath platform_support.cc $(REP_DIR)/src/core/panda
vpath platform_services.cc $(BASE_DIR)/src/core
vpath mode_transition.s $(REP_DIR)/src/core/arm_v7
vpath syscall.cc $(REP_DIR)/src/base/arm
vpath crt0.s $(REP_DIR)/src/core/arm
#

4
base-hw/src/core/pbxa9/target.mk
View File

@ -13,8 +13,7 @@ INC_DIR += $(REP_DIR)/src/core/pbxa9
# add C++ sources
SRC_CC += platform_services.cc \
platform_support.cc \
syscall.cc
platform_support.cc
# add assembly sources
SRC_S += mode_transition.s \
@ -25,7 +24,6 @@ SRC_S += mode_transition.s \
vpath platform_services.cc $(BASE_DIR)/src/core
vpath platform_support.cc $(REP_DIR)/src/core/pbxa9
vpath mode_transition.s $(REP_DIR)/src/core/arm_v7
vpath syscall.cc $(REP_DIR)/src/base/arm
vpath crt0.s $(REP_DIR)/src/core/arm
#

24
base-hw/src/core/target.inc
View File

@ -10,21 +10,8 @@ TARGET = core
# set entry point of core's first thread
CC_OPT += -DCORE_MAIN=_main
# core brings its own startup code
STARTUP_LIB =
# add library dependencies
LIBS += cxx \
raw_ipc \
heap \
child \
process \
pager \
lock \
console \
signal \
raw_server \
syscall
LIBS += base-common
# add include paths
INC_DIR += $(REP_DIR)/src/core \
@ -36,8 +23,7 @@ INC_DIR += $(REP_DIR)/src/core \
$(BASE_DIR)/src/platform
# add C++ sources
SRC_CC += _main.cc \
console.cc \
SRC_CC += console.cc \
cpu_session_component.cc \
cpu_session_support.cc \
dataspace_component.cc \
@ -59,7 +45,9 @@ SRC_CC += _main.cc \
kernel.cc \
rm_session_support.cc \
kernel_support.cc \
trustzone.cc
trustzone.cc \
pager.cc \
_main.cc
# declare file locations
vpath _main.cc $(BASE_DIR)/src/platform
@ -74,5 +62,7 @@ vpath rm_session_component.cc $(BASE_DIR)/src/core
vpath rom_session_component.cc $(BASE_DIR)/src/core
vpath dump_alloc.cc $(BASE_DIR)/src/core
vpath console.cc $(REP_DIR)/src/base
vpath pager.cc $(REP_DIR)/src/base
vpath _main.cc $(BASE_DIR)/src/platform
vpath % $(REP_DIR)/src/core

4
base-hw/src/core/vea9x4/target.inc
View File

@ -10,8 +10,7 @@ INC_DIR += $(REP_DIR)/src/core/vea9x4
# add C++ sources
SRC_CC += platform_services.cc \
platform_support.cc \
syscall.cc
platform_support.cc
# add assembly sources
SRC_S += crt0.s \
@ -31,7 +30,6 @@ endif
# declare source paths
vpath mode_transition.s $(REP_DIR)/src/core/arm_v7
vpath syscall.cc $(REP_DIR)/src/base/arm
vpath crt0.s $(REP_DIR)/src/core/arm
# include less specific target parts

29
base-linux/lib/mk/base-common.mk Normal file
View File

@ -0,0 +1,29 @@
#
# \brief Portions of base library shared by core and non-core processes
# \author Norman Feske
# \date 2013-02-14
#
LIBS += syscall
SRC_CC += ipc/ipc.cc
SRC_CC += avl_tree/avl_tree.cc
SRC_CC += allocator/slab.cc
SRC_CC += allocator/allocator_avl.cc
SRC_CC += heap/heap.cc heap/sliced_heap.cc
SRC_CC += console/console.cc
SRC_CC += child/child.cc
SRC_CC += process/process.cc
SRC_CC += elf/elf_binary.cc
SRC_CC += lock/lock.cc
SRC_CC += env/rm_session_mmap.cc env/debug.cc
SRC_CC += signal/signal.cc
SRC_CC += server/server.cc server/common.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
INC_DIR += $(REP_DIR)/src/platform $(BASE_DIR)/src/platform
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

18
base-linux/lib/mk/base.inc Normal file
View File

@ -0,0 +1,18 @@
#
# \brief Portions of base library that are exclusive to non-core processes
# \author Norman Feske
# \date 2013-02-14
#
# The content of this file is used for both native Genode as well as hybrid
# Linux/Genode programs. Hence, it must be void of any thread-related code.
#
LIBS += base-common syscall
SRC_CC += console/log_console.cc
SRC_CC += env/env.cc env/platform_env.cc env/context_area.cc
INC_DIR += $(REP_DIR)/src/base/env
vpath %.cc $(REP_DIR)/src/base
vpath %.cc $(BASE_DIR)/src/base

5
base-linux/lib/mk/core_printf.mk
View File

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

7
base-linux/lib/mk/env.mk
View File

@ -1,7 +0,0 @@
SRC_CC = env.cc rm_session_mmap.cc platform_env.cc debug.cc context_area.cc
LIBS = ipc heap log_console lock syscall
INC_DIR += $(REP_DIR)/src/base/env
vpath env.cc $(BASE_DIR)/src/base/env
vpath context_area.cc $(BASE_DIR)/src/base/env
vpath %.cc $(REP_DIR)/src/base/env

6
base-linux/lib/mk/ipc.mk
View File

@ -1,6 +0,0 @@
REQUIRES = linux
SRC_CC = ipc.cc
LIBS = syscall cap_copy
INC_DIR += $(REP_DIR)/src/base/ipc
vpath ipc.cc $(REP_DIR)/src/base/ipc

5
base-linux/lib/mk/lock.mk