News item for Genode 13.11

fix #981

.gitignore

@@ -25,11 +25,14 @@
 /libports/include/GL
 /libports/include/KHR
 /libports/include/SDL
+/libports/include/exfat
 /libports/include/ffat
 /libports/include/fribidi
 /libports/include/freetype
 /libports/include/ft2build.h
+/libports/include/fuse-ext2
 /libports/include/iconv/
+/libports/include/icu/
 /libports/include/jbig2dec
 /libports/include/libc-amd64/
 /libports/include/libc-arm/
@@ -104,6 +107,14 @@
 /libports/include/stdcxx-genode/bits/nested_exception.h
 /libports/include/stdcxx-genode/exception
 /libports/include/stdcxx-genode/new
+/libports/include/stdcxx-genode/typeinfo
+/libports/include/stdcxx-genode/initializer_list
+/libports/include/x86emu/stdint.h
+/libports/include/x86emu/stdio.h
+/libports/include/x86emu/stdlib.h
+/libports/include/x86emu/string.h
+/libports/include/x86emu/x86emu.h
+/libports/include/x86emu/x86emu/
 /libports/src/lib/gmp/mpn/asm-defs.m4
 /libports/src/lib/gmp/mpn/arm/hamdist.c
 /libports/src/lib/gmp/mpn/arm/popcount.c
@@ -120,8 +131,19 @@
 /libports/src/lib/ncurses/make_keys
 /libports/src/lib/ncurses/names.c
 /libports/src/lib/ncurses/unctrl.c
+/libports/src/lib/qt5/qtjsbackend
+/libports/src/lib/qt5/qtwebkit/Source/JavaScriptCore
+/libports/src/lib/qt5/qtwebkit/Source/WebCore/generated
 /libports/tool/mesa/glsl
 /libports/tool/mupdf
+/libports/tool/qt5/bootstrap
+/libports/tool/qt5/misc/var
+/libports/tool/qt5/moc
+/libports/tool/qt5/qmake/*.d
+/libports/tool/qt5/qmake/*.o
+/libports/tool/qt5/qmake/qmake
+/libports/tool/qt5/rcc
+/libports/tool/qt5/uic
 /ports-foc/contrib
 /ports-okl4/contrib
 /ports-okl4/download

README

@@ -127,7 +127,8 @@ The Genode source tree is composed of the following subdirectories:
   to Genode, most importantly the C library. The repository contains no
   upstream source code but means to download the code and adapt it to Genode.
   For instructions about how to use this mechanism, please consult the README
-  file at the top level of the repository.
+  file at the top level of the repository. Among the 3rd-party libraries
+  are Qt5, libSDL, freetype, Python, ncurses, Mesa, and libav.
 
 :'dde_linux':
 
@@ -155,7 +156,8 @@ The Genode source tree is composed of the following subdirectories:
 
   This source-code repository contains the Genode version of Qt4 framework.
   Please find more information about using Qt4 with Genode in the repository's
-  'README' file.
+  'README' file. Please note that the Qt4 support is deprecated. Use Qt5
+  as contained in 'libports' instead.
 
 :'ports':
 
@@ -169,8 +171,7 @@ The Genode source tree is composed of the following subdirectories:
 :'ports-<platform>':
 
   These platform-specific source-code repositories contain software that
-  capitalizes special features of the respective kernel platform. I.e.,
-  for the OKL4 base platform, a port of OKLinux is provided in 'ports-okl4'.
+  capitalizes special features of the respective kernel platform.
   For the Fiasco.OC platform, 'ports-foc' hosts a port of the L4Linux
   kernel. For further information, please refer to the README file at the
   top level of the respective repository.

base-codezero/Makefile

@@ -6,7 +6,7 @@
 
 VERBOSE    ?= @
 ECHO        = @echo
-GIT_URL     = http://git.l4dev.org/codezero.git
+GIT_URL     = https://github.com/nfeske/codezero.git
 GIT_REV     = 6fa4884a5a1cf6207372f69ae01e5faa6d5a39c8
 CONTRIB_DIR = contrib
 PATCHES     = $(shell find patches -name *.patch)
@@ -18,6 +18,8 @@ check_tool = $(if $(shell which $(1)),,$(error Need to have '$(1)' installed.))
 
 $(call check_tool,git)
 $(call check_tool,patch)
+$(call check_tool,python2.6)
+$(call check_tool,scons)
 
 #
 # Print help information by default

base-codezero/lib/mk/base-common.mk

@@ -6,9 +6,9 @@
 
 LIBS += cxx l4 startup
 
-SRC_CC += cap_copy.cc
+SRC_CC += cap_copy.cc main_bootstrap.cc
 SRC_CC += ipc/ipc.cc ipc/pager.cc ipc/ipc_marshal_cap.cc
-SRC_CC += pager/pager.cc
+SRC_CC += pager/pager.cc pager/common.cc
 SRC_CC += avl_tree/avl_tree.cc
 SRC_CC += allocator/slab.cc
 SRC_CC += allocator/allocator_avl.cc
@@ -20,13 +20,15 @@ SRC_CC += elf/elf_binary.cc
 SRC_CC += lock/lock.cc
 SRC_CC += signal/signal.cc signal/common.cc
 SRC_CC += server/server.cc server/common.cc
-SRC_CC += thread/thread.cc thread/thread_bootstrap.cc
+SRC_CC += thread/thread.cc thread/thread_bootstrap.cc thread/trace.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
+INC_DIR +=  $(REP_DIR)/src/base/lock
+INC_DIR += $(BASE_DIR)/src/base/thread
+INC_DIR +=  $(REP_DIR)/include/codezero/dummies
 
-vpath cap_copy.cc $(BASE_DIR)/src/platform
-vpath %.cc        $(REP_DIR)/src/base
-vpath %.cc        $(BASE_DIR)/src/base
+vpath main_bootstrap.cc $(REP_DIR)/src/platform
+vpath cap_copy.cc      $(BASE_DIR)/src/platform
+vpath %.cc              $(REP_DIR)/src/base
+vpath %.cc             $(BASE_DIR)/src/base

base-codezero/src/base/ipc/ipc.cc

@@ -115,8 +115,8 @@ void Ipc_client::_call()
 }
 
 
-Ipc_client::Ipc_client(Native_capability const &srv,
-                       Msgbuf_base *snd_msg, Msgbuf_base *rcv_msg)
+Ipc_client::Ipc_client(Native_capability const &srv, Msgbuf_base *snd_msg,
+                       Msgbuf_base *rcv_msg, unsigned short)
 : Ipc_istream(rcv_msg), Ipc_ostream(srv, snd_msg), _result(0)
 { }
 

base-codezero/src/core/include/platform_thread.h

@@ -134,7 +134,12 @@ namespace Genode {
 			/**
 			 * Set the executing CPU for this thread
 			 */
-			void affinity(unsigned cpu);
+			void affinity(Affinity::Location) { }
+
+			/**
+			 * Get the executing CPU for this thread
+			 */
+			Affinity::Location affinity() { return Affinity::Location(); }
 
 			/**
 			 * Get thread name

base-codezero/src/core/platform_thread.cc

@@ -27,12 +27,6 @@ using namespace Genode;
 using namespace Codezero;
 
 
-void Platform_thread::affinity(unsigned int cpu_no)
-{
-	PDBG("not yet implemented");
-}
-
-
 int Platform_thread::start(void *ip, void *sp, unsigned int cpu_no)
 {
 	Native_thread_id pager = _pager ? _pager->cap().dst() : THREAD_INVALID;

base-codezero/src/core/target.inc

@@ -23,6 +23,7 @@ SRC_CC      += \
                irq_session_component.cc \
                signal_session_component.cc \
                signal_source_component.cc \
+               trace_session_component.cc \
                core_rm_session.cc \
                core_mem_alloc.cc \
                dump_alloc.cc \
@@ -32,7 +33,8 @@ LIBS        += core_printf base-common
 
 INC_DIR     += $(REP_DIR)/src/core/include \
                $(GEN_CORE_DIR)/include \
-               $(REP_DIR)/include/codezero/dummies
+               $(REP_DIR)/include/codezero/dummies \
+               $(BASE_DIR)/src/base/thread
 
 vpath main.cc                     $(GEN_CORE_DIR)
 vpath ram_session_component.cc    $(GEN_CORE_DIR)
@@ -45,6 +47,7 @@ vpath io_mem_session_support.cc   $(GEN_CORE_DIR)
 vpath platform_services.cc        $(GEN_CORE_DIR)
 vpath signal_session_component.cc $(GEN_CORE_DIR)
 vpath signal_source_component.cc  $(GEN_CORE_DIR)
+vpath trace_session_component.cc  $(GEN_CORE_DIR)
 vpath dataspace_component.cc      $(GEN_CORE_DIR)
 vpath core_mem_alloc.cc           $(GEN_CORE_DIR)
 vpath dump_alloc.cc               $(GEN_CORE_DIR)

base-codezero/src/platform/main_bootstrap.cc

@@ -1,6 +1,7 @@
 /*
  * \brief  Platform-specific helper functions for the _main() function
  * \author Norman Feske
+ * \author Christian Helmuth
  * \date   2009-10-02
  */
 
@@ -11,14 +12,11 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PLATFORM___MAIN_HELPER_H_
-#define _PLATFORM___MAIN_HELPER_H_
-
+/* Genode includes */
+#include <base/stdint.h>
 #include <base/printf.h>
-
-/* make Codezero includes happy */
-extern "C" char *strncpy(char *dest, const char *src, Genode::size_t n);
-extern "C" void *memcpy(void *dest, const void *src, Genode::size_t n);
+#include <base/thread.h>
+#include <util/string.h>
 
 /* Codezero includes */
 #include <codezero/syscalls.h>
@@ -59,19 +57,25 @@ extern "C" int printf(const char *format, ...)
  ** Startup-code helpers **
  **************************/
 
+namespace Genode { void platform_main_bootstrap(); }
+
 
 Genode::Native_thread_id main_thread_tid;
 Codezero::l4_mutex       main_thread_running_lock;
 
 
-static void main_thread_bootstrap()
+void Genode::platform_main_bootstrap()
 {
-	Codezero::__l4_init();
+	static struct Bootstrap
+	{
+		Bootstrap()
+		{
+			Codezero::__l4_init();
 
-	main_thread_tid = Codezero::thread_myself();
+			main_thread_tid = Codezero::thread_myself();
 
-	Codezero::l4_mutex_init(&main_thread_running_lock);
-	Codezero::l4_mutex_lock(&main_thread_running_lock); /* block on first mutex lock */
+			Codezero::l4_mutex_init(&main_thread_running_lock);
+			Codezero::l4_mutex_lock(&main_thread_running_lock); /* block on first mutex lock */
+		}
+	} bootstrap;
 }
-
-#endif /* _PLATFORM___MAIN_HELPER_H_ */

base-fiasco/Makefile

@@ -10,6 +10,17 @@ DOWNLOAD_DIR   = download
 CONTRIB_DIR    = contrib
 FIASCO_ARCHIVE = 3rd_fiasco.tar.bz2
 FIASCO_URI     = http://downloads.sourceforge.net/project/genode/3rd/$(FIASCO_ARCHIVE)
+PATCHES       = $(shell find patches -name *.patch)
+
+#
+# Utility to check if a tool is installed
+#
+check_tool = $(if $(shell which $(1)),,$(error Need to have '$(1)' installed.))
+
+$(call check_tool,wget)
+$(call check_tool,patch)
+$(call check_tool,tar)
+$(call check_tool,byacc)
 
 #
 # Print help information by default
@@ -33,6 +44,8 @@ $(CONTRIB_DIR): $(DOWNLOAD_DIR)/$(FIASCO_ARCHIVE)
 	$(ECHO) "unpacking source code to '$(CONTRIB_DIR)/'"
 	$(VERBOSE)tar xjf $<
 	$(VERBOSE)mv 3rd $@
+	$(ECHO) "applying patches to '$@/'"
+	$(VERBOSE)for i in $(PATCHES); do patch -d $@ -p0 < $$i; done
 	$(VERBOSE)touch $@
 
 prepare: $(CONTRIB_DIR)

base-fiasco/config/l4env-config.x86

@@ -34,8 +34,8 @@ BID_COLORED_PHASES=y
 BIDc_USE_SPECIAL_CC=y
 HOST_CC="gcc"
 HOST_CXX="g++"
-CC="$(SYSTEM_TARGET)gcc -m32"
-CXX="$(SYSTEM_TARGET)g++ -m32"
+CC="${SYSTEM_TARGET}gcc -m32"
+CXX="${SYSTEM_TARGET}g++ -m32"
 
 #
 # Tools

base-fiasco/doc/fiasco.txt

@@ -44,6 +44,12 @@ command from within the 'base-fiasco' directory:
 
 ! make prepare
 
+For the vesa driver on x86 the x86emu library is required and can be downloaded
+and prepared by invoking the following command from within the 'libports'
+directory:
+
+! make prepare PKG=x86emu
+
 This command will download a prepackaged version of the kernel tested
 with Genode. The build process of the kernel is integrated with Genode's
 build system. After creating a build directory using 'create_builddir'

base-fiasco/lib/mk/base-common.mk

@@ -6,9 +6,9 @@
 
 LIBS += cxx startup
 
-SRC_CC += cap_copy.cc
+SRC_CC += cap_copy.cc main_bootstrap.cc
 SRC_CC += ipc/ipc.cc ipc/pager.cc ipc/ipc_marshal_cap.cc
-SRC_CC += pager/pager.cc
+SRC_CC += pager/pager.cc pager/common.cc
 SRC_CC += avl_tree/avl_tree.cc
 SRC_CC += allocator/slab.cc
 SRC_CC += allocator/allocator_avl.cc
@@ -20,10 +20,12 @@ SRC_CC += elf/elf_binary.cc
 SRC_CC += lock/lock.cc
 SRC_CC += signal/signal.cc signal/common.cc
 SRC_CC += server/server.cc server/common.cc
-SRC_CC += thread/thread.cc thread/thread_bootstrap_empty.cc
+SRC_CC += thread/thread.cc thread/thread_bootstrap_empty.cc thread/trace.cc
 
-INC_DIR += $(REP_DIR)/src/base/lock
+INC_DIR +=  $(REP_DIR)/src/base/lock
+INC_DIR += $(BASE_DIR)/src/base/thread
 
-vpath cap_copy.cc $(BASE_DIR)/src/platform
-vpath %.cc         $(REP_DIR)/src/base
-vpath %.cc        $(BASE_DIR)/src/base
+vpath main_bootstrap.cc  $(REP_DIR)/src/platform
+vpath cap_copy.cc       $(BASE_DIR)/src/platform
+vpath %.cc               $(REP_DIR)/src/base
+vpath %.cc              $(BASE_DIR)/src/base

base-fiasco/patches/bda.patch

@@ -0,0 +1,15 @@
+--- fiasco/snapshot/kernel/fiasco/src/kern/kernel_uart.cpp	2008-07-30 13:19:01.000000000 +0200
++++ fiasco/snapshot/kernel/fiasco/src/kern/kernel_uart.cpp	2013-06-10 14:21:54.183996620 +0200
+@@ -72,6 +72,12 @@
+   if (  (s = strstr(cmdline, " -comport "))
+       ||(s = strstr(cmdline, " -comport=")))
+     p = strtoul(s + 10, 0, 0);
++  else
++    {
++      unsigned short bda_comports  = (*((unsigned short *)0x410) >> 9) & 0x7;
++      if (bda_comports)
++        p = *((unsigned short *)0x400);
++    }
+ 
+   if ((s = strstr(cmdline, " -comirq=")))
+     i = strtoul(s + 9, 0, 0);

base-fiasco/patches/c++11.patch

@@ -0,0 +1,30 @@
+diff -ur contrib.bak/fiasco/snapshot/l4/pkg/l4sys/include/ARCH-x86/kdebug.h contrib/fiasco/snapshot/l4/pkg/l4sys/include/ARCH-x86/kdebug.h
+--- fiasco/snapshot/l4/pkg/l4sys/include/ARCH-x86/kdebug.h	2008-07-30 13:19:01.000000000 +0200
++++ fiasco/snapshot/l4/pkg/l4sys/include/ARCH-x86/kdebug.h	2013-09-23 09:02:29.875532260 +0200
+@@ -21,7 +21,7 @@
+ asm(\
+     "int	$3	\n\t"\
+     "jmp	1f	\n\t"\
+-    ".ascii	\""text "\"\n\t"\
++    ".ascii	\"" text "\"\n\t"\
+     "1:			\n\t"\
+     )
+ 
+@@ -35,7 +35,7 @@
+ #define asm_enter_kdebug(text) \
+     "int	$3	\n\t"\
+     "jmp	1f	\n\t"\
+-    ".ascii	\""text "\"\n\t"\
++    ".ascii	\"" text "\"\n\t"\
+     "1:			\n\t"
+ 
+ /**
+@@ -50,7 +50,7 @@
+     "int	$3	\n\t"\
+     "nop		\n\t"\
+     "jmp	1f	\n\t"\
+-    ".ascii	\""text "\"\n\t"\
++    ".ascii	\"" text "\"\n\t"\
+     "1:			\n\t"\
+     )
+ 

base-fiasco/run/env

@@ -13,6 +13,7 @@
 #
 proc install_pxe_bootloader_to_run_dir { } {
 	exec cp [genode_dir]/tool/boot/pulsar [run_dir]/boot/pulsar
+	exec cp [genode_dir]/tool/boot/bender [run_dir]/boot/bender
 }
 
 
@@ -141,7 +142,8 @@ proc build_boot_image {binaries} {
 	# Generate pulsar config file
 	#
 	set fh [open "[run_dir]/config-52-54-00-12-34-56" "WRONLY CREAT TRUNC"]
-	puts $fh " exec /fiasco/bootstrap -serial -modaddr=0x02000000"
+	puts $fh " exec /boot/bender"
+	puts $fh " load /fiasco/bootstrap -serial -modaddr=0x02000000"
 	puts $fh " load /fiasco/fiasco -serial -serial_esc -jdb_cmd=JH"
 	puts $fh " load /fiasco/sigma0"
 	puts $fh " load /genode/core"
@@ -155,17 +157,15 @@ proc build_boot_image {binaries} {
 	# Generate pulsar config file pointing to the config file above.
 	#
 	if {[info exists ::env(PXE_TFTP_DIR_BASE)] && [info exists ::env(PXE_TFTP_DIR_OFFSET)]} {
-		set len [string length $::env(PXE_TFTP_DIR_BASE)]
-		set tmp [string range [pwd] 0 $len-1]
-		# if PXE_TFTP_DIR_BASE is part of pwd (autopilot) we don't need DIR_OFFSET
-		if ([string match $tmp $::env(PXE_TFTP_DIR_BASE)]) {
-			set tftp_local_offset [string range [pwd] $len [string length [pwd]]]
-		} else {
-			set tftp_local_offset $::env(PXE_TFTP_DIR_OFFSET)
+		exec ln -nfs "[pwd]" "$::env(PXE_TFTP_DIR_BASE)$::env(PXE_TFTP_DIR_OFFSET)"
+
+		set tftp_base ""
+		if {[get_cmd_switch --tftp-absolute]} {
+			set tftp_base $::env(PXE_TFTP_DIR_BASE)
 		}
 
 		set fh [open "$::env(PXE_TFTP_DIR_BASE)$::env(PXE_TFTP_DIR_OFFSET)/config-00-00-00-00-00-00" "WRONLY CREAT TRUNC"]
-		puts $fh " root $tftp_local_offset/[run_dir]"
+		puts $fh " root $tftp_base$::env(PXE_TFTP_DIR_OFFSET)/[run_dir]"
 		puts $fh " config config-52-54-00-12-34-56"
 		close $fh
 	}

base-fiasco/src/base/ipc/ipc.cc

@@ -152,7 +152,7 @@ void Ipc_client::_call()
 
 
 Ipc_client::Ipc_client(Native_capability const &srv, Msgbuf_base *snd_msg,
-                                                     Msgbuf_base *rcv_msg):
+                       Msgbuf_base *rcv_msg, unsigned short):
 	Ipc_istream(rcv_msg), Ipc_ostream(srv, snd_msg), _result(0)
 { }
 

base-fiasco/src/core/include/platform_thread.h

@@ -121,7 +121,12 @@ namespace Genode {
 			 *
 			 * SMP is not supported on L4/Fiasco.
 			 */
-			void affinity(unsigned) { }
+			void affinity(Affinity::Location) { }
+
+			/**
+			 * Request the affinity of this thread
+			 */
+			Affinity::Location affinity() { return Affinity::Location(); }
 
 			/**
 			 * Return the address space to which the thread is bound

base-fiasco/src/core/platform.cc

@@ -130,7 +130,7 @@ static void _core_pager_loop()
 }
 
 
-Platform::Sigma0::Sigma0() : Pager_object(0)
+Platform::Sigma0::Sigma0() : Pager_object(0, Affinity::Location())
 {
 	cap(reinterpret_cap_cast<Cpu_thread>(Native_capability(Fiasco::sigma0_threadid, 0)));
 }
@@ -145,7 +145,7 @@ Platform::Sigma0 *Platform::sigma0()
 
 Platform::Core_pager::Core_pager(Platform_pd *core_pd)
 :
-	Platform_thread("core.pager"), Pager_object(0)
+	Platform_thread("core.pager"), Pager_object(0, Affinity::Location())
 {
 	Platform_thread::pager(sigma0());
 

base-fiasco/src/core/target.inc

@@ -24,13 +24,15 @@ SRC_CC      += main.cc \
                irq_session_component.cc \
                signal_session_component.cc \
                signal_source_component.cc \
+               trace_session_component.cc \
                dump_alloc.cc \
                context_area.cc \
                core_printf.cc
 
 INC_DIR     += $(REP_DIR)/src/core/include \
                $(GEN_CORE_DIR)/include \
-               $(REP_DIR)/src/base/console
+               $(REP_DIR)/src/base/console \
+               $(BASE_DIR)/src/base/thread
 
 LIBS        += base-common
 
@@ -45,6 +47,7 @@ vpath io_mem_session_component.cc $(GEN_CORE_DIR)
 vpath io_mem_session_support.cc   $(GEN_CORE_DIR)
 vpath signal_session_component.cc $(GEN_CORE_DIR)
 vpath signal_source_component.cc  $(GEN_CORE_DIR)
+vpath trace_session_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)

base-fiasco/src/platform/main_bootstrap.cc

@@ -11,9 +11,4 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PLATFORM___MAIN_HELPER_H_
-#define _PLATFORM___MAIN_HELPER_H_
-
-static void main_thread_bootstrap() { }
-
-#endif /* _PLATFORM___MAIN_HELPER_H_ */
+namespace Genode { void platform_main_bootstrap() { /* dummy */ } }

base-foc/Makefile

@@ -9,7 +9,7 @@ VERBOSE    ?= @
 ECHO        = @echo
 SVN_URI     = http://svn.tudos.org/repos/oc/tudos/trunk
 GIT_URI     = http://github.com/ssumpf/foc.git
-GIT_BRANCH  = r47
+GIT_BRANCH  = r56
 CONTRIB_DIR = contrib
 GNU_FIND   ?= find
 
@@ -63,6 +63,7 @@ checkout_base:
 ifeq ($(SVN_REV),)
 	$(error Syntax 'make checkout SVN_REV=<revision>')
 endif
+	$(VERBOSE)svn export -r $(SVN_REV) $(SVN_URI)/l4/COPYING-GPL-2 $(SVN_REV)
 	$(VERBOSE)svn co -r $(SVN_REV) --depth immediates $(SVN_URI) $(SVN_REV)
 	$(VERBOSE)svn co -r $(SVN_REV) --depth files $(SVN_URI)/l4 $(SVN_REV)/l4
 	$(VERBOSE)svn co -r $(SVN_REV) --depth files $(SVN_URI)/l4/pkg $(SVN_REV)/l4/pkg

base-foc/config/arndale.kernel

@@ -12,22 +12,35 @@ CONFIG_ARM=y
 # CONFIG_PF_IMX is not set
 # CONFIG_PF_REALVIEW is not set
 # CONFIG_PF_S3C2410 is not set
-# CONFIG_PF_TEGRA2 is not set
+# CONFIG_PF_TEGRA is not set
 # CONFIG_PF_OMAP is not set
 # CONFIG_PF_SA1100 is not set
 # CONFIG_PF_XSCALE is not set
+CONFIG_PF_EXYNOS=y
 # CONFIG_PF_KIRKWOOD is not set
 # CONFIG_PF_INTEGRATOR is not set
+# CONFIG_PF_BCM2835 is not set
+CONFIG_BSP_NAME="exynos"
 CONFIG_PF_EXYNOS5=y
-CONFIG_BSP_NAME="exynos5"
-CONFIG_PF_EXYNOS5_ARNDALE=y
+CONFIG_PF_EXYNOS_PKG_IDS=""
+# CONFIG_PF_EXYNOS4_4210 is not set
+# CONFIG_PF_EXYNOS4_4412 is not set
+CONFIG_PF_EXYNOS5_5250=y
+CONFIG_PF_EXYNOS_UART_NR=2
+CONFIG_PF_EXYNOS_TIMER_MCT=y
+# CONFIG_PF_EXYNOS_TIMER_PWM is not set
 CONFIG_ABI_VF=y
 CONFIG_PF_ARM_MP_CAPABLE=y
 CONFIG_CAN_ARM_CPU_CORTEX_A15=y
 CONFIG_ARM_CORTEX_A15=y
 # CONFIG_ARM_ALIGNMENT_CHECK is not set
+CONFIG_ARM_EM_STD=y
+# CONFIG_ARM_EM_NS is not set
+# CONFIG_ARM_EM_TZ is not set
+# CONFIG_ARM_ENABLE_SWP is not set
+# CONFIG_ARM_LPAE is not set
 CONFIG_FPU=y
-# CONFIG_ARM_CPU_ERRATA is not set
+CONFIG_ARM_CPU_ERRATA=y
 
 #
 # Kernel options
@@ -37,9 +50,7 @@ CONFIG_MP_MAX_CPUS=4
 CONFIG_CONTEXT_4K=y
 # CONFIG_FINE_GRAINED_CPUTIME is not set
 CONFIG_SCHED_FIXED_PRIO=y
-# CONFIG_SCHED_WFQ is not set
-# CONFIG_SCHED_FP_WFQ is not set
-# CONFIG_DISABLE_VIRT_OBJ_SPACE is not set
+CONFIG_VIRT_OBJ_SPACE=y
 
 #
 # Debugging
@@ -51,9 +62,9 @@ CONFIG_INLINE=y
 # CONFIG_LIST_ALLOC_SANITY is not set
 CONFIG_SERIAL=y
 CONFIG_JDB=y
-CONFIG_JDB_LOGGING=y
-# CONFIG_JDB_DISASM is not set
-# CONFIG_JDB_GZIP is not set
+# CONFIG_JDB_LOGGING is not set
+CONFIG_JDB_DISASM=y
+CONFIG_JDB_GZIP=y
 # CONFIG_VMEM_ALLOC_TEST is not set
 # CONFIG_DEBUG_KERNEL_PAGE_FAULTS is not set
 # CONFIG_WARN_NONE is not set
@@ -69,7 +80,7 @@ CONFIG_HOST_CC="gcc"
 CONFIG_HOST_CXX="g++"
 # CONFIG_MAINTAINER_MODE is not set
 CONFIG_LABEL=""
-CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPERIMENTAL is not set
 CONFIG_PERF_CNT=y
 CONFIG_BIT32=y
 CONFIG_ARM_V7=y

base-foc/config/arndale.user

@@ -23,24 +23,29 @@ CONFIG_CPU_ARM_ARMV7A=y
 # CONFIG_CPU_ARM_ARMV7R is not set
 CONFIG_CPU_ARMV6KPLUS=y
 CONFIG_CPU_ARMV6PLUS=y
-CONFIG_PLATFORM_TYPE_arndale=y
+# CONFIG_PLATFORM_TYPE_imx53 is not set
+# CONFIG_PLATFORM_TYPE_imx35 is not set
+# CONFIG_PLATFORM_TYPE_rv_pbx is not set
+CONFIG_PLATFORM_TYPE_exynos5=y
+# CONFIG_PLATFORM_TYPE_rv is not set
+# CONFIG_PLATFORM_TYPE_kirkwood is not set
+# CONFIG_PLATFORM_TYPE_pandaboard is not set
+# CONFIG_PLATFORM_TYPE_tegra3 is not set
+# CONFIG_PLATFORM_TYPE_tegra2 is not set
+# CONFIG_PLATFORM_TYPE_imx6 is not set
+# CONFIG_PLATFORM_TYPE_exynos4 is not set
+# CONFIG_PLATFORM_TYPE_omap3_am33xx is not set
+# CONFIG_PLATFORM_TYPE_rpi_b is not set
+# CONFIG_PLATFORM_TYPE_rv_vexpress_a15 is not set
+# CONFIG_PLATFORM_TYPE_imx51 is not set
+# CONFIG_PLATFORM_TYPE_omap3evm is not set
 # CONFIG_PLATFORM_TYPE_beagleboard is not set
 # CONFIG_PLATFORM_TYPE_imx21 is not set
-# CONFIG_PLATFORM_TYPE_imx35 is not set
-# CONFIG_PLATFORM_TYPE_imx51 is not set
-# CONFIG_PLATFORM_TYPE_imx53 is not set
-# CONFIG_PLATFORM_TYPE_imx6 is not set
-# CONFIG_PLATFORM_TYPE_integrator is not set
-# CONFIG_PLATFORM_TYPE_kirkwood is not set
-# CONFIG_PLATFORM_TYPE_omap3_am33xx is not set
-# CONFIG_PLATFORM_TYPE_omap3evm is not set
-# CONFIG_PLATFORM_TYPE_pandaboard is not set
-# CONFIG_PLATFORM_TYPE_rv is not set
-# CONFIG_PLATFORM_TYPE_rv_pbx is not set
 # CONFIG_PLATFORM_TYPE_rv_vexpress is not set
-# CONFIG_PLATFORM_TYPE_tegra2 is not set
+# CONFIG_PLATFORM_TYPE_rpi_a is not set
+# CONFIG_PLATFORM_TYPE_integrator is not set
 # CONFIG_PLATFORM_TYPE_custom is not set
-CONFIG_PLATFORM_TYPE="arndale"
+CONFIG_PLATFORM_TYPE="exynos5"
 # CONFIG_USE_DROPS_STDDIR is not set
 # CONFIG_USE_DICE is not set
 CONFIG_DROPS_STDDIR="/path/to/l4re"

base-foc/config/imx53.kernel

@@ -12,13 +12,14 @@ CONFIG_ARM=y
 CONFIG_PF_IMX=y
 # CONFIG_PF_REALVIEW is not set
 # CONFIG_PF_S3C2410 is not set
-# CONFIG_PF_TEGRA2 is not set
+# CONFIG_PF_TEGRA is not set
 # CONFIG_PF_OMAP is not set
 # CONFIG_PF_SA1100 is not set
 # CONFIG_PF_XSCALE is not set
+# CONFIG_PF_EXYNOS is not set
 # CONFIG_PF_KIRKWOOD is not set
 # CONFIG_PF_INTEGRATOR is not set
-# CONFIG_PF_EXYNOS5 is not set
+# CONFIG_PF_BCM2835 is not set
 CONFIG_BSP_NAME="imx"
 # CONFIG_PF_IMX_21 is not set
 # CONFIG_PF_IMX_35 is not set
@@ -30,6 +31,9 @@ CONFIG_ABI_VF=y
 CONFIG_CAN_ARM_CPU_CORTEX_A8=y
 CONFIG_ARM_CORTEX_A8=y
 # CONFIG_ARM_ALIGNMENT_CHECK is not set
+CONFIG_ARM_EM_STD=y
+# CONFIG_ARM_EM_NS is not set
+# CONFIG_ARM_EM_TZ is not set
 # CONFIG_FPU is not set
 # CONFIG_ARM_CPU_ERRATA is not set
 
@@ -39,6 +43,7 @@ CONFIG_ARM_CORTEX_A8=y
 CONFIG_CONTEXT_4K=y
 # CONFIG_FINE_GRAINED_CPUTIME is not set
 CONFIG_SCHED_FIXED_PRIO=y
+CONFIG_VIRT_OBJ_SPACE=y
 
 #
 # Debugging

base-foc/config/imx53.user

@@ -23,22 +23,27 @@ CONFIG_CPU_ARM_ARMV7A=y
 # CONFIG_CPU_ARM_ARMV7R is not set
 CONFIG_CPU_ARMV6KPLUS=y
 CONFIG_CPU_ARMV6PLUS=y
-# CONFIG_PLATFORM_TYPE_arndale is not set
+CONFIG_PLATFORM_TYPE_imx53=y
+# CONFIG_PLATFORM_TYPE_imx35 is not set
+# CONFIG_PLATFORM_TYPE_rv_pbx is not set
+# CONFIG_PLATFORM_TYPE_exynos5 is not set
+# CONFIG_PLATFORM_TYPE_rv is not set
+# CONFIG_PLATFORM_TYPE_kirkwood is not set
+# CONFIG_PLATFORM_TYPE_pandaboard is not set
+# CONFIG_PLATFORM_TYPE_tegra3 is not set
+# CONFIG_PLATFORM_TYPE_tegra2 is not set
+# CONFIG_PLATFORM_TYPE_imx6 is not set
+# CONFIG_PLATFORM_TYPE_exynos4 is not set
+# CONFIG_PLATFORM_TYPE_omap3_am33xx is not set
+# CONFIG_PLATFORM_TYPE_rpi_b is not set
+# CONFIG_PLATFORM_TYPE_rv_vexpress_a15 is not set
+# CONFIG_PLATFORM_TYPE_imx51 is not set
+# CONFIG_PLATFORM_TYPE_omap3evm is not set
 # CONFIG_PLATFORM_TYPE_beagleboard is not set
 # CONFIG_PLATFORM_TYPE_imx21 is not set
-# CONFIG_PLATFORM_TYPE_imx35 is not set
-# CONFIG_PLATFORM_TYPE_imx51 is not set
-CONFIG_PLATFORM_TYPE_imx53=y
-# CONFIG_PLATFORM_TYPE_imx6 is not set
-# CONFIG_PLATFORM_TYPE_integrator is not set
-# CONFIG_PLATFORM_TYPE_kirkwood is not set
-# CONFIG_PLATFORM_TYPE_omap3_am33xx is not set
-# CONFIG_PLATFORM_TYPE_omap3evm is not set
-# CONFIG_PLATFORM_TYPE_pandaboard is not set
-# CONFIG_PLATFORM_TYPE_rv is not set
-# CONFIG_PLATFORM_TYPE_rv_pbx is not set
 # CONFIG_PLATFORM_TYPE_rv_vexpress is not set
-# CONFIG_PLATFORM_TYPE_tegra2 is not set
+# CONFIG_PLATFORM_TYPE_rpi_a is not set
+# CONFIG_PLATFORM_TYPE_integrator is not set
 # CONFIG_PLATFORM_TYPE_custom is not set
 CONFIG_PLATFORM_TYPE="imx53"
 # CONFIG_USE_DROPS_STDDIR is not set

base-foc/config/panda.kernel

@@ -12,14 +12,15 @@ CONFIG_ARM=y
 # CONFIG_PF_IMX is not set
 # CONFIG_PF_REALVIEW is not set
 # CONFIG_PF_S3C2410 is not set
-# CONFIG_PF_TEGRA2 is not set
+# CONFIG_PF_TEGRA is not set
 CONFIG_PF_OMAP=y
 # CONFIG_PF_SA1100 is not set
 # CONFIG_PF_XSCALE is not set
+# CONFIG_PF_EXYNOS is not set
 # CONFIG_PF_KIRKWOOD is not set
 # CONFIG_PF_INTEGRATOR is not set
-# CONFIG_PF_EXYNOS5 is not set
-CONFIG_BSP_NAME="omap3"
+# CONFIG_PF_BCM2835 is not set
+CONFIG_BSP_NAME="omap"
 # CONFIG_PF_OMAP3_OMAP35XEVM is not set
 # CONFIG_PF_OMAP3_BEAGLEBOARD is not set
 # CONFIG_PF_OMAP3_AM33XX is not set
@@ -30,8 +31,10 @@ CONFIG_CAN_ARM_CPU_CORTEX_A9=y
 CONFIG_CAN_ARM_CACHE_L2CXX0=y
 CONFIG_ARM_CORTEX_A9=y
 # CONFIG_ARM_ALIGNMENT_CHECK is not set
-# CONFIG_ARM_TZ is not set
-CONFIG_ARM_CA9_ENABLE_SWP=y
+CONFIG_ARM_EM_STD=y
+# CONFIG_ARM_EM_NS is not set
+# CONFIG_ARM_EM_TZ is not set
+# CONFIG_ARM_ENABLE_SWP is not set
 CONFIG_ARM_CACHE_L2CXX0=y
 CONFIG_FPU=y
 # CONFIG_ARM_CPU_ERRATA is not set
@@ -47,6 +50,7 @@ CONFIG_SCHED_FIXED_PRIO=y
 # CONFIG_SCHED_WFQ is not set
 # CONFIG_SCHED_FP_WFQ is not set
 # CONFIG_DISABLE_VIRT_OBJ_SPACE is not set
+CONFIG_VIRT_OBJ_SPACE=y
 
 #
 # Debugging

base-foc/config/panda.user

@@ -23,22 +23,27 @@ CONFIG_CPU_ARM_ARMV7A=y
 # CONFIG_CPU_ARM_ARMV7R is not set
 CONFIG_CPU_ARMV6KPLUS=y
 CONFIG_CPU_ARMV6PLUS=y
-# CONFIG_PLATFORM_TYPE_arndale is not set
+# CONFIG_PLATFORM_TYPE_imx53 is not set
+# CONFIG_PLATFORM_TYPE_imx35 is not set
+# CONFIG_PLATFORM_TYPE_rv_pbx is not set
+# CONFIG_PLATFORM_TYPE_exynos5 is not set
+# CONFIG_PLATFORM_TYPE_rv is not set
+# CONFIG_PLATFORM_TYPE_kirkwood is not set
+CONFIG_PLATFORM_TYPE_pandaboard=y
+# CONFIG_PLATFORM_TYPE_tegra3 is not set
+# CONFIG_PLATFORM_TYPE_tegra2 is not set
+# CONFIG_PLATFORM_TYPE_imx6 is not set
+# CONFIG_PLATFORM_TYPE_exynos4 is not set
+# CONFIG_PLATFORM_TYPE_omap3_am33xx is not set
+# CONFIG_PLATFORM_TYPE_rpi_b is not set
+# CONFIG_PLATFORM_TYPE_rv_vexpress_a15 is not set
+# CONFIG_PLATFORM_TYPE_imx51 is not set
+# CONFIG_PLATFORM_TYPE_omap3evm is not set
 # CONFIG_PLATFORM_TYPE_beagleboard is not set
 # CONFIG_PLATFORM_TYPE_imx21 is not set
-# CONFIG_PLATFORM_TYPE_imx35 is not set
-# CONFIG_PLATFORM_TYPE_imx51 is not set
-# CONFIG_PLATFORM_TYPE_imx53 is not set
-# CONFIG_PLATFORM_TYPE_imx6 is not set
-# CONFIG_PLATFORM_TYPE_integrator is not set
-# CONFIG_PLATFORM_TYPE_kirkwood is not set
-# CONFIG_PLATFORM_TYPE_omap3_am33xx is not set
-# CONFIG_PLATFORM_TYPE_omap3evm is not set
-CONFIG_PLATFORM_TYPE_pandaboard=y
-# CONFIG_PLATFORM_TYPE_rv is not set
-# CONFIG_PLATFORM_TYPE_rv_pbx is not set
 # CONFIG_PLATFORM_TYPE_rv_vexpress is not set
-# CONFIG_PLATFORM_TYPE_tegra2 is not set
+# CONFIG_PLATFORM_TYPE_rpi_a is not set
+# CONFIG_PLATFORM_TYPE_integrator is not set
 # CONFIG_PLATFORM_TYPE_custom is not set
 CONFIG_PLATFORM_TYPE="pandaboard"
 # CONFIG_USE_DROPS_STDDIR is not set

base-foc/config/pbxa9.kernel

@@ -12,13 +12,14 @@ CONFIG_ARM=y
 # CONFIG_PF_IMX is not set
 CONFIG_PF_REALVIEW=y
 # CONFIG_PF_S3C2410 is not set
-# CONFIG_PF_TEGRA2 is not set
+# CONFIG_PF_TEGRA is not set
 # CONFIG_PF_OMAP is not set
 # CONFIG_PF_SA1100 is not set
 # CONFIG_PF_XSCALE is not set
+# CONFIG_PF_EXYNOS is not set
 # CONFIG_PF_KIRKWOOD is not set
 # CONFIG_PF_INTEGRATOR is not set
-# CONFIG_PF_EXYNOS5 is not set
+# CONFIG_PF_BCM2835 is not set
 CONFIG_BSP_NAME="realview"
 # CONFIG_PF_REALVIEW_EB is not set
 # CONFIG_PF_REALVIEW_PB11MP is not set
@@ -34,7 +35,10 @@ CONFIG_CAN_ARM_CPU_CORTEX_A9=y
 CONFIG_CAN_ARM_CACHE_L2CXX0=y
 CONFIG_ARM_CORTEX_A9=y
 # CONFIG_ARM_ALIGNMENT_CHECK is not set
-# CONFIG_ARM_CA9_ENABLE_SWP is not set
+CONFIG_ARM_EM_STD=y
+# CONFIG_ARM_EM_NS is not set
+# CONFIG_ARM_EM_TZ is not set
+# CONFIG_ARM_ENABLE_SWP is not set
 # CONFIG_ARM_CACHE_L2CXX0 is not set
 CONFIG_FPU=y
 CONFIG_ARM_CPU_ERRATA=y
@@ -46,6 +50,7 @@ CONFIG_ARM_CPU_ERRATA=y
 CONFIG_CONTEXT_4K=y
 # CONFIG_FINE_GRAINED_CPUTIME is not set
 CONFIG_SCHED_FIXED_PRIO=y
+CONFIG_VIRT_OBJ_SPACE=y
 
 #
 # Debugging

base-foc/config/pbxa9.user

@@ -23,22 +23,27 @@ CONFIG_CPU_ARM_ARMV7A=y
 # CONFIG_CPU_ARM_ARMV7R is not set
 CONFIG_CPU_ARMV6KPLUS=y
 CONFIG_CPU_ARMV6PLUS=y
-# CONFIG_PLATFORM_TYPE_arndale is not set
+# CONFIG_PLATFORM_TYPE_imx53 is not set
+# CONFIG_PLATFORM_TYPE_imx35 is not set
+CONFIG_PLATFORM_TYPE_rv_pbx=y
+# CONFIG_PLATFORM_TYPE_exynos5 is not set
+# CONFIG_PLATFORM_TYPE_rv is not set
+# CONFIG_PLATFORM_TYPE_kirkwood is not set
+# CONFIG_PLATFORM_TYPE_pandaboard is not set
+# CONFIG_PLATFORM_TYPE_tegra3 is not set
+# CONFIG_PLATFORM_TYPE_tegra2 is not set
+# CONFIG_PLATFORM_TYPE_imx6 is not set
+# CONFIG_PLATFORM_TYPE_exynos4 is not set
+# CONFIG_PLATFORM_TYPE_omap3_am33xx is not set
+# CONFIG_PLATFORM_TYPE_rpi_b is not set
+# CONFIG_PLATFORM_TYPE_rv_vexpress_a15 is not set
+# CONFIG_PLATFORM_TYPE_imx51 is not set
+# CONFIG_PLATFORM_TYPE_omap3evm is not set
 # CONFIG_PLATFORM_TYPE_beagleboard is not set
 # CONFIG_PLATFORM_TYPE_imx21 is not set
-# CONFIG_PLATFORM_TYPE_imx35 is not set
-# CONFIG_PLATFORM_TYPE_imx51 is not set
-# CONFIG_PLATFORM_TYPE_imx53 is not set
-# CONFIG_PLATFORM_TYPE_imx6 is not set
-# CONFIG_PLATFORM_TYPE_integrator is not set
-# CONFIG_PLATFORM_TYPE_kirkwood is not set
-# CONFIG_PLATFORM_TYPE_omap3_am33xx is not set
-# CONFIG_PLATFORM_TYPE_omap3evm is not set
-# CONFIG_PLATFORM_TYPE_pandaboard is not set
-# CONFIG_PLATFORM_TYPE_rv is not set
-CONFIG_PLATFORM_TYPE_rv_pbx=y
 # CONFIG_PLATFORM_TYPE_rv_vexpress is not set
-# CONFIG_PLATFORM_TYPE_tegra2 is not set
+# CONFIG_PLATFORM_TYPE_rpi_a is not set
+# CONFIG_PLATFORM_TYPE_integrator is not set
 # CONFIG_PLATFORM_TYPE_custom is not set
 CONFIG_PLATFORM_TYPE="rv_pbx"
 # CONFIG_USE_DROPS_STDDIR is not set

base-foc/config/vea9x4.kernel

@@ -12,28 +12,34 @@ CONFIG_ARM=y
 # CONFIG_PF_IMX is not set
 CONFIG_PF_REALVIEW=y
 # CONFIG_PF_S3C2410 is not set
-# CONFIG_PF_TEGRA2 is not set
+# CONFIG_PF_TEGRA is not set
 # CONFIG_PF_OMAP is not set
 # CONFIG_PF_SA1100 is not set
 # CONFIG_PF_XSCALE is not set
+# CONFIG_PF_EXYNOS is not set
 # CONFIG_PF_KIRKWOOD is not set
 # CONFIG_PF_INTEGRATOR is not set
-# CONFIG_PF_EXYNOS5 is not set
+# CONFIG_PF_BCM2835 is not set
 CONFIG_BSP_NAME="realview"
 # CONFIG_PF_REALVIEW_EB is not set
 # CONFIG_PF_REALVIEW_PB11MP is not set
 # CONFIG_PF_REALVIEW_PBX is not set
 CONFIG_PF_REALVIEW_VEXPRESS=y
+CONFIG_PF_REALVIEW_VEXPRESS_A9=y
 # CONFIG_PF_REALVIEW_RAM_PHYS_BASE_0x0 is not set
 CONFIG_PF_REALVIEW_RAM_PHYS_BASE_0x6=y
 CONFIG_PF_REALVIEW_RAM_PHYS_BASE=0x60000000
 CONFIG_ABI_VF=y
 CONFIG_PF_ARM_MP_CAPABLE=y
 CONFIG_CAN_ARM_CPU_CORTEX_A9=y
+CONFIG_CAN_ARM_CPU_CORTEX_A15=y
 CONFIG_ARM_CORTEX_A9=y
+# CONFIG_ARM_CORTEX_A15 is not set
 # CONFIG_ARM_ALIGNMENT_CHECK is not set
-# CONFIG_ARM_TZ is not set
-# CONFIG_ARM_CA9_ENABLE_SWP is not set
+CONFIG_ARM_EM_STD=y
+# CONFIG_ARM_EM_NS is not set
+# CONFIG_ARM_EM_TZ is not set
+# CONFIG_ARM_ENABLE_SWP is not set
 CONFIG_FPU=y
 CONFIG_ARM_CPU_ERRATA=y
 
@@ -48,6 +54,7 @@ CONFIG_SCHED_FIXED_PRIO=y
 # CONFIG_SCHED_WFQ is not set
 # CONFIG_SCHED_FP_WFQ is not set
 # CONFIG_DISABLE_VIRT_OBJ_SPACE is not set
+CONFIG_VIRT_OBJ_SPACE=y
 
 #
 # Debugging

base-foc/config/vea9x4.user

@@ -23,22 +23,27 @@ CONFIG_CPU_ARM_ARMV7A=y
 # CONFIG_CPU_ARM_ARMV7R is not set
 CONFIG_CPU_ARMV6KPLUS=y
 CONFIG_CPU_ARMV6PLUS=y
-# CONFIG_PLATFORM_TYPE_arndale is not set
+# CONFIG_PLATFORM_TYPE_imx53 is not set
+# CONFIG_PLATFORM_TYPE_imx35 is not set
+# CONFIG_PLATFORM_TYPE_rv_pbx is not set
+# CONFIG_PLATFORM_TYPE_exynos5 is not set
+# CONFIG_PLATFORM_TYPE_rv is not set
+# CONFIG_PLATFORM_TYPE_kirkwood is not set
+# CONFIG_PLATFORM_TYPE_pandaboard is not set
+# CONFIG_PLATFORM_TYPE_tegra3 is not set
+# CONFIG_PLATFORM_TYPE_tegra2 is not set
+# CONFIG_PLATFORM_TYPE_imx6 is not set
+# CONFIG_PLATFORM_TYPE_exynos4 is not set
+# CONFIG_PLATFORM_TYPE_omap3_am33xx is not set
+# CONFIG_PLATFORM_TYPE_rpi_b is not set
+# CONFIG_PLATFORM_TYPE_rv_vexpress_a15 is not set
+# CONFIG_PLATFORM_TYPE_imx51 is not set
+# CONFIG_PLATFORM_TYPE_omap3evm is not set
 # CONFIG_PLATFORM_TYPE_beagleboard is not set
 # CONFIG_PLATFORM_TYPE_imx21 is not set
-# CONFIG_PLATFORM_TYPE_imx35 is not set
-# CONFIG_PLATFORM_TYPE_imx51 is not set
-# CONFIG_PLATFORM_TYPE_imx53 is not set
-# CONFIG_PLATFORM_TYPE_imx6 is not set
-# CONFIG_PLATFORM_TYPE_integrator is not set
-# CONFIG_PLATFORM_TYPE_kirkwood is not set
-# CONFIG_PLATFORM_TYPE_omap3_am33xx is not set
-# CONFIG_PLATFORM_TYPE_omap3evm is not set
-# CONFIG_PLATFORM_TYPE_pandaboard is not set
-# CONFIG_PLATFORM_TYPE_rv is not set
-# CONFIG_PLATFORM_TYPE_rv_pbx is not set
 CONFIG_PLATFORM_TYPE_rv_vexpress=y
-# CONFIG_PLATFORM_TYPE_tegra2 is not set
+# CONFIG_PLATFORM_TYPE_rpi_a is not set
+# CONFIG_PLATFORM_TYPE_integrator is not set
 # CONFIG_PLATFORM_TYPE_custom is not set
 CONFIG_PLATFORM_TYPE="rv_vexpress"
 # CONFIG_USE_DROPS_STDDIR is not set

base-foc/config/x86_32.kernel

@@ -39,6 +39,7 @@ CONFIG_CONTEXT_4K=y
 # CONFIG_SYNC_TSC is not set
 # CONFIG_FINE_GRAINED_CPUTIME is not set
 CONFIG_SCHED_FIXED_PRIO=y
+CONFIG_VIRT_OBJ_SPACE=y
 
 #
 # Debugging

base-foc/config/x86_64.kernel

@@ -30,6 +30,7 @@ CONFIG_SCHED_FIXED_PRIO=y
 # CONFIG_SCHED_WFQ is not set
 # CONFIG_SCHED_FP_WFQ is not set
 # CONFIG_DISABLE_VIRT_OBJ_SPACE is not set
+CONFIG_VIRT_OBJ_SPACE=y
 
 #
 # Debugging

base-foc/doc/foc.txt

@@ -54,6 +54,12 @@ just do:
 
 This will install all necessary third-party source code in the 'contrib' folder.
 
+For the vesa driver on x86 the x86emu library is required and can be downloaded
+and prepared by invoking the following command from within the 'libports'
+directory:
+
+! make prepare PKG=x86emu
+
 Now, go to a directory where you want the Genode/Fiasco.OC build directory to
 remain. Use the helper script in the 'tool' directory of the Genode
 source tree to create the initial build environment. You need to state the

base-foc/include/base/ipc_pager.h

@@ -156,6 +156,11 @@ namespace Genode {
 			 */
 			void acknowledge_wakeup();
 
+			/**
+			 * Reply to an exception IPC
+			 */
+			void acknowledge_exception();
+
 			/**
 			 * Return thread ID of last faulter
 			 */
@@ -183,9 +188,15 @@ namespace Genode {
 
 			/**
 			 * Copy the exception registers from the last exception
-			 * to the given thread_state object.
+			 * to the given Thread_state object.
 			 */
-			void copy_regs(Thread_state *state);
+			void get_regs(Thread_state *state);
+
+			/*
+			 * Copy the exception reply registers from the given
+			 * Thread_state object
+			 */
+			void set_regs(Thread_state state);
 	};
 }
 

base-foc/include/base/native_types.h

@@ -11,15 +11,46 @@ namespace Fiasco {
 #include <l4/sys/task.h>
 
 	enum Cap_selectors {
-		TASK_CAP         = L4_BASE_TASK_CAP,
-		PARENT_CAP       = 0x8UL   << L4_CAP_SHIFT,
-		THREADS_BASE_CAP = 0x9UL   << L4_CAP_SHIFT,
+
+		/**********************************************
+		 ** Capability seclectors controlled by core **
+		 **********************************************/
+
+		TASK_CAP         = L4_BASE_TASK_CAP, /* use the same task cap selector
+		                                        like L4Re for compatibility in
+		                                        L4Linux */
+
+		/*
+		 * To not clash with other L4Re cap selector constants (e.g.: L4Linux)
+		 * leave the following selectors (2-7) empty
+		 */
+
+		PARENT_CAP       = 0x8UL   << L4_CAP_SHIFT, /* cap to parent session */
+
+		/*
+		 * Each thread has a designated slot in the core controlled cap
+		 * selector area, where its ipc gate capability (for server threads),
+		 * its irq capability (for locks), and the capability to its pager
+		 * gate are stored
+		 */
+		THREAD_AREA_BASE = 0x9UL   << L4_CAP_SHIFT, /* offset to thread area */
+		THREAD_AREA_SLOT = 0x3UL   << L4_CAP_SHIFT, /* size of one thread slot */
+		THREAD_GATE_CAP  = 0,                       /* offset to the ipc gate
+		                                               cap selector in the slot */
+		THREAD_PAGER_CAP = 0x1UL   << L4_CAP_SHIFT, /* offset to the pager
+		                                               cap selector in the slot */
+		THREAD_IRQ_CAP   = 0x2UL   << L4_CAP_SHIFT, /* offset to the irq cap
+		                                               selector in the slot */
+		MAIN_THREAD_CAP  = THREAD_AREA_BASE + THREAD_GATE_CAP, /* shortcut to the
+		                                                          main thread's
+		                                                          gate cap */
+
+
+		/*********************************************************
+		 ** Capability seclectors controlled by the task itself **
+		 *********************************************************/
+
 		USER_BASE_CAP    = 0x200UL << L4_CAP_SHIFT,
-		THREAD_GATE_CAP  = 0,
-		THREAD_PAGER_CAP = 0x1UL   << L4_CAP_SHIFT,
-		THREAD_IRQ_CAP   = 0x2UL   << L4_CAP_SHIFT,
-		THREAD_CAP_SLOT  = THREAD_IRQ_CAP + L4_CAP_SIZE,
-		MAIN_THREAD_CAP  = THREADS_BASE_CAP + THREAD_GATE_CAP
 	};
 
 	enum Utcb_regs {

base-foc/include/base/thread_state.h

@@ -18,11 +18,11 @@
 
 #include <base/capability.h>
 #include <base/lock.h>
-#include <cpu/cpu_state.h>
+#include <base/thread_state_base.h>
 
 namespace Genode {
 
-	struct Thread_state : public Cpu_state
+	struct Thread_state : Thread_state_base
 	{
 		Native_thread         kcap;         /* thread's gate cap in its pd */
 		int                   id;           /* id of gate capability */

base-foc/include/foc_cpu_session/client.h

@@ -67,11 +67,23 @@ namespace Genode {
 		void single_step(Thread_capability thread, bool enable) {
 			call<Rpc_single_step>(thread, enable); }
 
-		unsigned num_cpus() const {
-			return call<Rpc_num_cpus>(); }
+		Affinity::Space affinity_space() const {
+			return call<Rpc_affinity_space>(); }
 
-		void affinity(Thread_capability thread, unsigned cpu) {
-			call<Rpc_affinity>(thread, cpu); }
+		void affinity(Thread_capability thread, Affinity::Location location) {
+			call<Rpc_affinity>(thread, location); }
+
+		Dataspace_capability trace_control() {
+			return call<Rpc_trace_control>(); }
+
+		unsigned trace_control_index(Thread_capability thread) {
+			return call<Rpc_trace_control_index>(thread); }
+
+		Dataspace_capability trace_buffer(Thread_capability thread) {
+			return call<Rpc_trace_buffer>(thread); }
+
+		Dataspace_capability trace_policy(Thread_capability thread) {
+			return call<Rpc_trace_policy>(thread); }
 
 		void enable_vcpu(Thread_capability cap, addr_t vcpu_state) {
 			call<Rpc_enable_vcpu>(cap, vcpu_state); }

base-foc/include/util/assert.h

@@ -22,13 +22,13 @@ namespace Fiasco {
 
 #if 1
 #define ASSERT(e, s) \
-	do { if (!(e)) {								   \
-		Fiasco::outstring(ESC_ERR s ESC_END "\n");	   \
-		Fiasco::outstring(__FILE__ ":");			   \
-		Fiasco::outhex32((int)__LINE__);			   \
-		Fiasco::outstring("\n");					   \
-		enter_kdebug("ASSERT");				   \
-		}											   \
+	do { if (!(e)) {                               \
+		Fiasco::outstring(ESC_ERR s ESC_END "\n"); \
+		Fiasco::outstring(__FILE__ ":");           \
+		Fiasco::outdec(__LINE__);                  \
+		Fiasco::outstring("\n");                   \
+		enter_kdebug("ASSERT");                    \
+		}                                          \
 	} while(0)
 #else
 #define ASSERT(e, s)  do { } while (0)

base-foc/lib/mk/arm/base.mk

@@ -0,0 +1,3 @@
+include $(REP_DIR)/lib/mk/base.inc
+
+SRC_CC += thread/thread_context_area.cc

base-foc/lib/mk/base-common.inc

@@ -6,8 +6,9 @@
 
 LIBS += cxx syscall startup
 
+SRC_CC += main_bootstrap.cc
 SRC_CC += ipc/ipc.cc ipc/pager.cc
-SRC_CC += pager/pager.cc
+SRC_CC += pager/pager.cc pager/common.cc
 SRC_CC += avl_tree/avl_tree.cc
 SRC_CC += allocator/slab.cc
 SRC_CC += allocator/allocator_avl.cc
@@ -20,9 +21,14 @@ SRC_CC += lock/lock.cc
 SRC_CC += env/spin_lock.cc env/cap_map.cc
 SRC_CC += signal/signal.cc signal/common.cc
 SRC_CC += server/server.cc server/common.cc
-SRC_CC += thread/thread.cc thread/thread_bootstrap.cc
+SRC_CC += thread/thread.cc thread/thread_bootstrap.cc thread/trace.cc
 
-INC_DIR += $(REP_DIR)/src/base/lock $(BASE_DIR)/src/base/lock
+INC_DIR +=  $(REP_DIR)/src/base/lock
+INC_DIR += $(BASE_DIR)/src/base/lock
+INC_DIR += $(BASE_DIR)/src/base/thread
 
-vpath %.cc  $(REP_DIR)/src/base
-vpath %.cc $(BASE_DIR)/src/base
+vpath main_bootstrap.cc  $(REP_DIR)/src/platform
+vpath %.cc               $(REP_DIR)/src/base
+vpath %.cc              $(BASE_DIR)/src/base
+
+# vi: set ft=make :

base-foc/lib/mk/base.inc

@@ -9,7 +9,7 @@ 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 thread/thread_context_area.cc
+SRC_CC += thread/thread_start.cc
 
 INC_DIR += $(BASE_DIR)/src/base/env
 

base-foc/lib/mk/exynos5/base.mk

@@ -0,0 +1,3 @@
+include $(REP_DIR)/lib/mk/base.inc
+
+SRC_CC += thread/arndale/thread_context_area.cc

base-foc/lib/mk/x86/base.mk

@@ -0,0 +1,3 @@
+include $(REP_DIR)/lib/mk/base.inc
+
+SRC_CC += thread/thread_context_area.cc

base-foc/mk/spec-foc_arndale.mk

@@ -1,4 +1,5 @@
 SPECS += foc_arm platform_arndale uboot
 
+include $(call select_from_repositories,mk/spec-fpu_vfpv3.mk)
 include $(call select_from_repositories,mk/spec-platform_arndale.mk)
 include $(call select_from_repositories,mk/spec-foc_arm.mk)

base-foc/run/env

@@ -11,6 +11,7 @@
 #
 proc install_pxe_bootloader_to_run_dir { } {
 	exec cp [genode_dir]/tool/boot/pulsar [run_dir]/boot/pulsar
+	exec cp [genode_dir]/tool/boot/bender [run_dir]/boot/bender
 }
 
 ##
@@ -123,37 +124,6 @@ proc bin_dir { } {
 	exit 1
 }
 
-#
-# Parse entry point address out of final elf image for u-boot
-#
-proc entrypoint { } {
-	global _entrypoint
-	set _entrypoint [exec [cross_dev_prefix]readelf -h [run_dir]/image.elf | grep "Entry point" | sed -e "s/.*Entry point address: *//"]
-	return $_entrypoint
-}
-
-
-#
-# Parse load address out of final elf image for u-boot
-#
-proc loadaddr { } {
-	global _loadaddr
-	set _loadaddr [regexp -inline -all -- {\S+} [exec [cross_dev_prefix]readelf -l [run_dir]/image.elf | grep -m 1 "LOAD"]]
-	return [lindex $_loadaddr 3]
-}
-
-
-#
-# Create an u-boot image if appropriated SPEC is set
-#
-proc build_boot_uimage { } {
-	if {[have_spec uboot]} {
-		exec [cross_dev_prefix]objcopy -O binary [run_dir]/image.elf [run_dir]/image.bin
-		exec gzip --best --force [run_dir]/image.bin
-		exec mkimage -A arm -O linux -T kernel -C gzip -a [loadaddr] -e [entrypoint] -d [run_dir]/image.bin.gz [run_dir]/uImage
-	}
-}
-
 set fiasco_serial_esc_arg "-serial_esc "
 
 proc build_boot_image_x86 {binaries} {
@@ -209,7 +179,8 @@ proc build_boot_image_x86 {binaries} {
 	# Generate pulsar config file
 	#
 	set fh [open "[run_dir]/config-52-54-00-12-34-56" "WRONLY CREAT TRUNC"]
-	puts $fh " exec /fiasco/bootstrap -modaddr=0x01100000"
+	puts $fh " exec /boot/bender"
+	puts $fh " load /fiasco/bootstrap -modaddr=0x01100000"
 	puts $fh " load /fiasco/fiasco -serial_esc"
 	puts $fh " load /fiasco/sigma0"
 	puts $fh " load /genode/core"
@@ -223,17 +194,15 @@ proc build_boot_image_x86 {binaries} {
 	# Generate pulsar config file pointing to the config file above.
 	#
 	if {[info exists ::env(PXE_TFTP_DIR_BASE)] && [info exists ::env(PXE_TFTP_DIR_OFFSET)]} {
-		set len [string length $::env(PXE_TFTP_DIR_BASE)]
-		set tmp [string range [pwd] 0 $len-1]
-		# if PXE_TFTP_DIR_BASE is part of pwd (autopilot) we don't need DIR_OFFSET
-		if ([string match $tmp $::env(PXE_TFTP_DIR_BASE)]) {
-			set tftp_local_offset [string range [pwd] $len [string length [pwd]]]
-		} else {
-		    set tftp_local_offset $::env(PXE_TFTP_DIR_OFFSET)
+		exec ln -nfs "[pwd]" "$::env(PXE_TFTP_DIR_BASE)$::env(PXE_TFTP_DIR_OFFSET)"
+
+		set tftp_base ""
+		if {[get_cmd_switch --tftp-absolute]} {
+			set tftp_base $::env(PXE_TFTP_DIR_BASE)
 		}
 
 		set fh [open "$::env(PXE_TFTP_DIR_BASE)$::env(PXE_TFTP_DIR_OFFSET)/config-00-00-00-00-00-00" "WRONLY CREAT TRUNC"]
-		puts $fh " root $tftp_local_offset/[run_dir]"
+		puts $fh " root $tftp_base$::env(PXE_TFTP_DIR_OFFSET)/[run_dir]"
 		puts $fh " config config-52-54-00-12-34-56"
 		close $fh
 	}
@@ -277,7 +246,7 @@ proc build_boot_image_arm {binaries} {
 	}
 
 	exec cp [bin_dir]/bootstrap.elf [run_dir]/image.elf
-	build_boot_uimage
+	build_uboot_image [run_dir]/image.elf
 
 	puts "\nboot image: [run_dir]/image.elf\n"
 
@@ -319,7 +288,7 @@ proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id
 		return
 	}
 	if {[is_serial_available]} {
-		spawn_serial $wait_for_re $timeout_value
+		spawn_serial $wait_for_re $timeout_value "L4 Bootstrapper"
 		return
 	}
 

base-foc/src/base/ipc/arm/pager.cc

@@ -17,23 +17,46 @@
 #include <base/ipc_pager.h>
 
 
-void Genode::Ipc_pager::copy_regs(Thread_state *state)
+void Genode::Ipc_pager::get_regs(Thread_state *state)
 {
-	state->ip = _regs.pc;
-	state->sp = _regs.sp;
-	state->r0  = _regs.r[0];
-	state->r1  = _regs.r[1];
-	state->r2  = _regs.r[2];
-	state->r3  = _regs.r[3];
-	state->r4  = _regs.r[4];
-	state->r5  = _regs.r[5];
-	state->r6  = _regs.r[6];
-	state->r7  = _regs.r[7];
-	state->r8  = _regs.r[8];
-	state->r9  = _regs.r[9];
-	state->r10 = _regs.r[10];
-	state->r11 = _regs.r[11];
-	state->r12 = _regs.r[12];
-	state->lr = _regs.ulr;
+	state->ip   = _regs.pc;
+	state->sp   = _regs.sp;
+	state->r0   = _regs.r[0];
+	state->r1   = _regs.r[1];
+	state->r2   = _regs.r[2];
+	state->r3   = _regs.r[3];
+	state->r4   = _regs.r[4];
+	state->r5   = _regs.r[5];
+	state->r6   = _regs.r[6];
+	state->r7   = _regs.r[7];
+	state->r8   = _regs.r[8];
+	state->r9   = _regs.r[9];
+	state->r10  = _regs.r[10];
+	state->r11  = _regs.r[11];
+	state->r12  = _regs.r[12];
+	state->lr   = _regs.ulr;
 	state->cpsr = _regs.cpsr;
 }
+
+
+void Genode::Ipc_pager::set_regs(Thread_state state)
+{
+	_regs.pc    = state.ip;
+	_regs.sp    = state.sp;
+	_regs.r[0]  = state.r0;
+	_regs.r[1]  = state.r1;
+	_regs.r[2]  = state.r2;
+	_regs.r[3]  = state.r3;
+	_regs.r[4]  = state.r4;
+	_regs.r[5]  = state.r5;
+	_regs.r[6]  = state.r6;
+	_regs.r[7]  = state.r7;
+	_regs.r[8]  = state.r8;
+	_regs.r[9]  = state.r9;
+	_regs.r[10] = state.r10;
+	_regs.r[11] = state.r11;
+	_regs.r[12] = state.r12;
+	_regs.ulr   = state.lr;
+	_regs.cpsr  = state.cpsr;
+}
+

base-foc/src/base/ipc/ipc.cc

@@ -291,8 +291,8 @@ void Ipc_client::_call()
 }
 
 
-Ipc_client::Ipc_client(Native_capability const &srv,
-                       Msgbuf_base *snd_msg, Msgbuf_base *rcv_msg)
+Ipc_client::Ipc_client(Native_capability const &srv, Msgbuf_base *snd_msg,
+                       Msgbuf_base *rcv_msg, unsigned short)
 : Ipc_istream(rcv_msg), Ipc_ostream(srv, snd_msg), _result(0) { }
 
 

base-foc/src/base/ipc/pager.cc

@@ -112,6 +112,14 @@ void Ipc_pager::acknowledge_wakeup()
 }
 
 
+void Ipc_pager::acknowledge_exception()
+{
+	memcpy(l4_utcb_exc(), &_regs, sizeof(l4_exc_regs_t));
+	l4_cap_idx_t dst = Fiasco::Capability::valid(_last) ? _last : L4_SYSF_REPLY;
+	l4_ipc_send(dst, l4_utcb(), l4_msgtag(0, L4_UTCB_EXCEPTION_REGS_SIZE, 0, 0), L4_IPC_SEND_TIMEOUT_0);
+}
+
+
 Ipc_pager::Ipc_pager()
 : Native_capability((Cap_index*)Fiasco::l4_utcb_tcr()->user[Fiasco::UTCB_TCR_BADGE]),
   _badge(0) { }

base-foc/src/base/ipc/x86_32/pager.cc

@@ -17,7 +17,7 @@
 #include <base/ipc_pager.h>
 
 
-void Genode::Ipc_pager::copy_regs(Thread_state *state)
+void Genode::Ipc_pager::get_regs(Genode::Thread_state *state)
 {
 	state->ip     = _regs.ip;
 	state->sp     = _regs.sp;
@@ -33,3 +33,22 @@ void Genode::Ipc_pager::copy_regs(Thread_state *state)
 	state->eflags = _regs.flags;
 	state->trapno = _regs.trapno;
 }
+
+
+void Genode::Ipc_pager::set_regs(Genode::Thread_state state)
+{
+	_regs.ip     = state.ip;
+	_regs.sp     = state.sp;
+	_regs.edi    = state.edi;
+	_regs.esi    = state.esi;
+	_regs.ebp    = state.ebp;
+	_regs.ebx    = state.ebx;
+	_regs.edx    = state.edx;
+	_regs.ecx    = state.ecx;
+	_regs.eax    = state.eax;
+	_regs.gs     = state.gs;
+	_regs.fs     = state.fs;
+	_regs.flags  = state.eflags;
+	_regs.trapno = state.trapno;
+}
+

base-foc/src/base/ipc/x86_64/pager.cc

@@ -17,7 +17,7 @@
 #include <base/ipc_pager.h>
 
 
-void Genode::Ipc_pager::copy_regs(Thread_state *state)
+void Genode::Ipc_pager::get_regs(Thread_state *state)
 {
 	state->ip     = _regs.ip;
 	state->sp     = _regs.sp;
@@ -40,3 +40,29 @@ void Genode::Ipc_pager::copy_regs(Thread_state *state)
 	state->eflags = _regs.flags;
 	state->trapno = _regs.trapno;
 }
+
+
+void Genode::Ipc_pager::set_regs(Thread_state state)
+{
+	_regs.ip     = state.ip;
+	_regs.sp     = state.sp;
+	_regs.r8     = state.r8;
+	_regs.r9     = state.r9;
+	_regs.r10    = state.r10;
+	_regs.r11    = state.r11;
+	_regs.r12    = state.r12;
+	_regs.r13    = state.r13;
+	_regs.r14    = state.r14;
+	_regs.r15    = state.r15;
+	_regs.rax    = state.rax;
+	_regs.rbx    = state.rbx;
+	_regs.rcx    = state.rcx;
+	_regs.rdx    = state.rdx;
+	_regs.rdi    = state.rdi;
+	_regs.rsi    = state.rsi;
+	_regs.rbp    = state.rbp;
+	_regs.ss     = state.ss;
+	_regs.flags  = state.eflags;
+	_regs.trapno = state.trapno;
+}
+

base-foc/src/base/pager/pager.cc

@@ -71,7 +71,7 @@ void Pager_activation_base::entry()
 			{
 				if (pager.is_exception()) {
 					Lock::Guard guard(obj->state.lock);
-					pager.copy_regs(&obj->state);
+					pager.get_regs(&obj->state);
 					obj->state.exceptions++;
 					obj->state.in_exception = true;
 					obj->submit_exception_signal();
@@ -81,6 +81,8 @@ void Pager_activation_base::entry()
 				/* handle request */
 				if (obj->pager(pager)) {
 					/* could not resolv - leave thread in pagefault */
+					Lock::Guard guard(obj->state.lock);
+					obj->state.unresolved_page_fault = true;
 					PDBG("Could not resolve pf=%p ip=%p",
 					     (void*)pager.fault_addr(), (void*)pager.fault_ip());
 				} else {
@@ -105,15 +107,17 @@ void Pager_activation_base::entry()
 				pager.set_reply_dst(Native_thread());
 				pager.acknowledge_wakeup();
 
-				/* revert exception flag */
 				{
 					Lock::Guard guard(obj->state.lock);
+					/* revert exception flag */
 					obj->state.in_exception = false;
+					/* set new register contents */
+					pager.set_regs(obj->state);
 				}
 
 				/* send wake up message to requested thread */
 				pager.set_reply_dst(obj->badge());
-				pager.acknowledge_wakeup();
+				pager.acknowledge_exception();
 				break;
 			}
 
@@ -124,8 +128,7 @@ void Pager_activation_base::entry()
 		case Ipc_pager::PAUSE:
 			{
 				Lock::Guard guard(obj->state.lock);
-				pager.copy_regs(&obj->state);
-
+				pager.get_regs(&obj->state);
 				obj->state.exceptions++;
 				obj->state.in_exception = true;
 

base-foc/src/base/thread/arndale/thread_context_area.cc

@@ -6,6 +6,10 @@
  * We need to place the context area within core outside the physical memory.
  * Sigma0 maps physical to core-local memory always 1:1 when using
  * SIGMA0_REQ_FPAGE_ANY. Those mappings would interfere with the context area.
+ *
+ * Because the UTCB area of a task resides at the end of the context area and
+ * its address gets calculated by core, the context area in other tasks needs
+ * to be at the same address as in core.
  */
 
 #include <base/native_types.h>

base-foc/src/base/thread/thread.cc

@@ -182,7 +182,8 @@ void Thread_base::name(char *dst, size_t dst_len)
 }
 
 
-Thread_base *Thread_base::myself() {
+Thread_base *Thread_base::myself()
+{
 	using namespace Fiasco;
 
 	return reinterpret_cast<Thread_base*>(l4_utcb_tcr()->user[UTCB_TCR_THREAD_OBJ]);

base-foc/src/core/arndale/target.mk

@@ -1,5 +1,5 @@
 # override default location of thread context area within core
-vpath thread_context_area.cc $(PRG_DIR)
+vpath thread_context_area.cc $(REP_DIR)/src/base/thread/arndale
 
 include $(PRG_DIR)/../target.inc
 

base-foc/src/core/include/cpu_session_component.h

@@ -1,6 +1,7 @@
 /*
  * \brief  Core-specific instance of the CPU session/thread interfaces
  * \author Christian Helmuth
+ * \author Norman Feske
  * \author Stefan Kalkowski
  * \date   2006-07-17
  */
@@ -26,6 +27,8 @@
 
 /* core includes */
 #include <platform_thread.h>
+#include <trace/control_area.h>
+#include <trace/source_registry.h>
 
 namespace Genode {
 
@@ -45,18 +48,33 @@ namespace Genode {
 	class Cpu_thread_component : public Rpc_object<Cpu_thread>,
 	                             public List<Cpu_thread_component>::Element
 	{
+		public:
+
+			typedef Trace::Session_label Session_label;
+			typedef Trace::Thread_name   Thread_name;
+
 		private:
 
+			Thread_name         const _name;
 			Platform_thread           _platform_thread;
 			bool                      _bound;            /* pd binding flag */
 			Signal_context_capability _sigh;             /* exception handler */
+			unsigned            const _trace_control_index;
+			Trace::Source             _trace_source;
 
 		public:
 
-			Cpu_thread_component(const char *name, unsigned priority, addr_t utcb,
-			                     Signal_context_capability sigh)
+			Cpu_thread_component(Session_label const &label,
+			                     Thread_name const &name,
+			                     unsigned priority, addr_t utcb,
+			                     Signal_context_capability sigh,
+			                     unsigned trace_control_index,
+			                     Trace::Control &trace_control)
 			:
-				_platform_thread(name, priority), _bound(false), _sigh(sigh)
+				_name(name),
+				_platform_thread(name.string(), priority, utcb), _bound(false),
+				_sigh(sigh), _trace_control_index(trace_control_index),
+				_trace_source(label, _name, trace_control)
 			{
 				update_exception_sigh();
 			}
@@ -66,9 +84,10 @@ namespace Genode {
 			 ** Accessor functions **
 			 ************************/
 
-			inline Platform_thread * platform_thread() { return &_platform_thread; }
-			inline bool bound() const                  { return _bound; }
-			inline void bound(bool b)                  { _bound = b; }
+			Platform_thread *platform_thread() { return &_platform_thread; }
+			bool             bound()     const { return _bound; }
+			void             bound(bool b)     { _bound = b; }
+			Trace::Source   *trace_source()    { return &_trace_source; }
 
 			void sigh(Signal_context_capability sigh)
 			{
@@ -80,11 +99,20 @@ namespace Genode {
 			 * Propagate exception handler to platform thread
 			 */
 			void update_exception_sigh();
+
+			/**
+			 * Return index within the CPU-session's trace control area
+			 */
+			unsigned trace_control_index() const { return _trace_control_index; }
 	};
 
 
 	class Cpu_session_component : public Rpc_object<Foc_cpu_session>
 	{
+		public:
+
+			typedef Cpu_thread_component::Session_label Session_label;
+
 		private:
 
 			/**
@@ -93,16 +121,21 @@ namespace Genode {
 			 */
 			typedef Tslab<Cpu_thread_component, 1024> Cpu_thread_allocator;
 
+			Session_label              _label;
 			Rpc_entrypoint            *_thread_ep;
 			Pager_entrypoint          *_pager_ep;
 			Allocator_guard            _md_alloc;          /* guarded meta-data allocator */
 			Cpu_thread_allocator       _thread_alloc;      /* meta-data allocator */
-			Lock                       _thread_alloc_lock; /* protect alloc access */
+			Lock                       _thread_alloc_lock; /* protect allocator access */
 			List<Cpu_thread_component> _thread_list;
 			Lock                       _thread_list_lock;  /* protect thread list */
 			unsigned                   _priority;          /* priority of threads
 			                                                  created with this
 			                                                  session */
+			Affinity::Location         _location;          /* CPU affinity of this 
+			                                                  session */
+			Trace::Source_registry    &_trace_sources;
+			Trace::Control_area        _trace_control_area;
 
 			/**
 			 * Exception handler that will be invoked unless overridden by a
@@ -125,9 +158,11 @@ namespace Genode {
 			/**
 			 * Constructor
 			 */
-			Cpu_session_component(Rpc_entrypoint   *thread_ep,
-			                      Pager_entrypoint *pager_ep,
-			                      Allocator *md_alloc, const char *args);
+			Cpu_session_component(Rpc_entrypoint         *thread_ep,
+			                      Pager_entrypoint       *pager_ep,
+			                      Allocator              *md_alloc,
+			                      Trace::Source_registry &trace_sources,
+			                      const char *args, Affinity const &affinity);
 
 			/**
 			 * Destructor
@@ -159,8 +194,12 @@ namespace Genode {
 			Thread_state state(Thread_capability);
 			void state(Thread_capability, Thread_state const &);
 			void exception_handler(Thread_capability, Signal_context_capability);
-			unsigned num_cpus() const;
-			void affinity(Thread_capability, unsigned);
+			Affinity::Space affinity_space() const;
+			void affinity(Thread_capability, Affinity::Location);
+			Dataspace_capability trace_control();
+			unsigned trace_control_index(Thread_capability);
+			Dataspace_capability trace_buffer(Thread_capability);
+			Dataspace_capability trace_policy(Thread_capability);
 
 
 			/***********************************

base-foc/src/core/include/platform.h

@@ -159,6 +159,7 @@ namespace Genode {
 			addr_t            vm_start() const { return _vm_start;       }
 			size_t            vm_size()  const { return _vm_size;        }
 			Rom_fs           *rom_fs()         { return &_rom_fs;        }
+			Affinity::Space   affinity_space() const;
 
 			void wait_for_exit();
 	};

base-foc/src/core/include/platform_thread.h

@@ -37,20 +37,22 @@ namespace Genode {
 
 			friend class Platform_pd;
 
-			State         _state;
-			bool          _core_thread;
-			Cap_mapping   _thread;
-			Cap_mapping   _gate;
-			Cap_mapping   _pager;
-			Cap_mapping   _irq;
-			Native_utcb   _utcb;
-			char          _name[32];       /* thread name that will be
-			                                 registered at the kernel
-			                                 debugger */
-			Platform_pd  *_platform_pd;    /* protection domain thread
-			                                 is bound to */
-			Pager_object *_pager_obj;
-			unsigned      _prio;
+			State              _state;
+			bool               _core_thread;
+			Cap_mapping        _thread;
+			Cap_mapping        _gate;
+			Cap_mapping        _pager;
+			Cap_mapping        _irq;
+			Native_utcb        _utcb;
+			char               _name[32];       /* thread name that will be
+			                                      registered at the kernel
+			                                      debugger */
+			Platform_pd       *_platform_pd;    /* protection domain thread
+			                                      is bound to */
+			Pager_object      *_pager_obj;
+			unsigned           _prio;
+
+			Affinity::Location _location;
 
 			void _create_thread(void);
 			void _finalize_construction(const char *name);
@@ -63,7 +65,7 @@ namespace Genode {
 			/**
 			 * Constructor for non-core threads
 			 */
-			Platform_thread(const char *name, unsigned priority);
+			Platform_thread(const char *name, unsigned priority, addr_t);
 
 			/**
 			 * Constructor for core main-thread
@@ -136,7 +138,12 @@ namespace Genode {
 			/**
 			 * Set the executing CPU for this thread
 			 */
-			void affinity(unsigned cpu);
+			void affinity(Affinity::Location location);
+
+			/**
+			 * Get the executing CPU for this thread
+			 */
+			Affinity::Location affinity();
 
 			/**
 			 * Return the address space to which the thread is bound

base-foc/src/core/irq_session_component.cc

@@ -48,7 +48,7 @@ class Genode::Interrupt_handler : public Thread<4096>
 {
 	private:
 
-		Interrupt_handler() { start(); }
+		Interrupt_handler() : Thread("irq_handler") { start(); }
 
 	public:
 
@@ -170,7 +170,7 @@ Irq_session_component::Irq_session_component(Cap_session     *cap_session,
 		PERR("Unavailable IRQ %lx requested", irq_number);
 		throw Root::Invalid_args();
 	}
-	
+
 	long irq_trigger = Arg_string::find_arg(args, "irq_trigger").long_value(-1);
 	irq_trigger = irq_trigger == -1 ? 0 : irq_trigger;
 
@@ -216,10 +216,8 @@ void Irq_session_component::wait_for_irq()
 }
 
 
-Irq_session_component::~Irq_session_component()
-{
-	PERR("Implement me, immediately!");
-}
+Irq_session_component::~Irq_session_component() {
+	_proxy->remove_sharer(); }
 
 
 /***************************************

base-foc/src/core/platform.cc

@@ -35,6 +35,7 @@ namespace Fiasco {
 #include <l4/sys/thread.h>
 #include <l4/sys/types.h>
 #include <l4/sys/utcb.h>
+#include <l4/sys/scheduler.h>
 
 static l4_kernel_info_t *kip;
 }
@@ -120,7 +121,7 @@ static void _core_pager_loop()
 }
 
 
-Platform::Sigma0::Sigma0(Cap_index* i) : Pager_object(0)
+Platform::Sigma0::Sigma0(Cap_index* i) : Pager_object(0, Affinity::Location())
 {
 	/*
 	 * We use the Pager_object here in a slightly different manner,
@@ -131,7 +132,7 @@ Platform::Sigma0::Sigma0(Cap_index* i) : Pager_object(0)
 
 
 Platform::Core_pager::Core_pager(Platform_pd *core_pd, Sigma0 *sigma0)
-: Platform_thread("core.pager"), Pager_object(0)
+: Platform_thread("core.pager"), Pager_object(0, Affinity::Location())
 {
 	Platform_thread::pager(sigma0);
 
@@ -387,7 +388,7 @@ void Platform::_setup_basics()
 	                           Native_config::context_area_virtual_size());
 
 	/* preserve utcb- area in core's virtual address space */
-	_region_alloc.remove_range((addr_t)l4_utcb(), L4_PAGESIZE);
+	_region_alloc.remove_range((addr_t)l4_utcb(), L4_PAGESIZE * 16);
 
 	/* I/O memory could be the whole user address space */
 	/* FIXME if the kernel helps to find out max address - use info here */
@@ -511,4 +512,31 @@ void Platform::wait_for_exit()
 }
 
 
+Affinity::Space Platform::affinity_space() const
+{
+	using namespace Genode;
+	using namespace Fiasco;
+
+	l4_sched_cpu_set_t cpus = l4_sched_cpu_set(0, 0, 1);
+	l4_umword_t cpus_max;
+	l4_msgtag_t res = l4_scheduler_info(L4_BASE_SCHEDULER_CAP, &cpus_max,
+	                                    &cpus);
+	if (l4_error(res)) {
+		PERR("could not detect number of CPUs - assuming 1 CPU");
+		return 1;
+	}
+
+	unsigned cpus_online = 0;
+	for (unsigned i = 0; i < sizeof(cpus.map) * 8; i++)
+		if ((cpus.map >> i) & 0x1)
+			cpus_online ++;
+
+	/*
+	 * Currently, we do not gather any information about the topology of CPU
+	 * nodes but just return a one-dimensional affinity space.
+	 */
+	return Affinity::Space(cpus_online, 1);
+}
+
+
 void Core_parent::exit(int exit_value) { }

base-foc/src/core/platform_pd.cc

@@ -53,7 +53,7 @@ int Platform_pd::bind_thread(Platform_thread *thread)
 		else
 			thread->_utcb =
 				reinterpret_cast<l4_utcb_t*>(utcb_area_start() + i * L4_UTCB_OFFSET);
-		Native_thread cap_offset   = THREADS_BASE_CAP + i * THREAD_CAP_SLOT;
+		Native_thread cap_offset   = THREAD_AREA_BASE + i * THREAD_AREA_SLOT;
 		thread->_gate.remote   = cap_offset + THREAD_GATE_CAP;
 		thread->_pager.remote  = cap_offset + THREAD_PAGER_CAP;
 		thread->_irq.remote    = cap_offset + THREAD_IRQ_CAP;

base-foc/src/core/platform_thread.cc

@@ -174,8 +174,8 @@ void Platform_thread::pager(Pager_object *pager_obj)
 
 void Platform_thread::state(Thread_state s)
 {
-	PDBG("Not implemented");
-	throw Cpu_session::State_access_failed();
+	if (_pager_obj)
+		_pager_obj->state = s;
 }
 
 
@@ -198,8 +198,12 @@ void Platform_thread::cancel_blocking()
 }
 
 
-void Platform_thread::affinity(unsigned cpu)
+void Platform_thread::affinity(Affinity::Location location)
 {
+	_location = location;
+
+	int const cpu = location.xpos();
+
 	l4_sched_param_t params = l4_sched_param(_prio);
 	params.affinity         = l4_sched_cpu_set(cpu, 0, 1);
 	l4_msgtag_t tag = l4_scheduler_run_thread(L4_BASE_SCHEDULER_CAP,
@@ -209,6 +213,12 @@ void Platform_thread::affinity(unsigned cpu)
 }
 
 
+Affinity::Location Platform_thread::affinity()
+{
+	return _location;
+}
+
+
 void Platform_thread::_create_thread()
 {
 	l4_msgtag_t tag = l4_factory_create_thread(L4_BASE_FACTORY_CAP,
@@ -251,8 +261,7 @@ Weak_ptr<Address_space> Platform_thread::address_space()
 }
 
 
-Platform_thread::Platform_thread(const char *name,
-                                 unsigned    prio)
+Platform_thread::Platform_thread(const char *name, unsigned prio, addr_t)
 : _state(DEAD),
   _core_thread(false),
   _thread(true),

base-foc/src/core/target.inc

@@ -31,6 +31,7 @@ SRC_CC       = cap_session_component.cc \
                rom_session_component.cc \
                signal_session_component.cc \
                signal_source_component.cc \
+               trace_session_component.cc \
                thread_start.cc \
                thread_context_area.cc \
                core_printf.cc
@@ -39,6 +40,7 @@ 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
 
 vpath context_area.cc             $(GEN_CORE_DIR)
@@ -54,6 +56,7 @@ 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 trace_session_component.cc  $(GEN_CORE_DIR)
 vpath core_printf.cc              $(BASE_DIR)/src/base/console
 vpath %.cc                        $(REP_DIR)/src/core
 vpath %.cc                        $(REP_DIR)/src/base/thread

base-foc/src/core/x86/platform_x86.cc

@@ -64,15 +64,20 @@ void Genode::Platform::setup_irq_mode(unsigned irq_number, unsigned trigger,
 
 		/*
 		 * Translate ACPI interrupt mode (trigger/polarity) to Fiasco APIC
-		 * values. Default is level low for IRQs > 15
+		 * values. Default is level low
 		 */
-		mode  = (trigger == Irq_session::TRIGGER_LEVEL) ||
-		        (irq_number > 15 && trigger == Irq_session::TRIGGER_UNCHANGED)
-		        ? L4_IRQ_F_LEVEL : L4_IRQ_F_EDGE;
-
-		mode |= (polarity == Irq_session::POLARITY_LOW) ||
-		        (irq_number > 15 && polarity == Irq_session::POLARITY_UNCHANGED)
-		        ? L4_IRQ_F_NEG   : L4_IRQ_F_POS;
+		if  (trigger == Irq_session::TRIGGER_LEVEL || trigger == Irq_session::TRIGGER_UNCHANGED) {
+			if (polarity == Irq_session::POLARITY_LOW || polarity == Irq_session::POLARITY_UNCHANGED)
+				mode = L4_IRQ_F_LEVEL_LOW;
+			else
+				mode = L4_IRQ_F_LEVEL_HIGH;
+		}
+		else {
+			if (polarity == Irq_session::POLARITY_LOW || polarity == Irq_session::POLARITY_UNCHANGED)
+				mode = L4_IRQ_F_NEG_EDGE;
+			else
+				mode = L4_IRQ_F_POS_EDGE;
+		}
 	}
 
 	/*

base-foc/src/platform/main_bootstrap.cc

@@ -1,6 +1,7 @@
 /*
  * \brief  Platform-specific helper functions for the _main() function
  * \author Christian Prochaska
+ * \author Christian Helmuth
  * \date   2009-08-05
  */
 
@@ -11,9 +12,6 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _PLATFORM___MAIN_HELPER_H_
-#define _PLATFORM___MAIN_HELPER_H_
-
 /* Genode includes */
 #include <base/stdint.h>
 #include <base/native_types.h>
@@ -23,16 +21,21 @@ namespace Fiasco {
 #include <l4/sys/utcb.h>
 }
 
-enum { MAIN_THREAD_CAP_ID = 1 };
 
-static void main_thread_bootstrap() {
-	using namespace Genode;
+namespace Genode { void platform_main_bootstrap(); }
 
-	Cap_index *i
-		= cap_map()->insert(MAIN_THREAD_CAP_ID, Fiasco::MAIN_THREAD_CAP);
-	Fiasco::l4_utcb_tcr()->user[Fiasco::UTCB_TCR_BADGE] = (unsigned long) i;
-	Fiasco::l4_utcb_tcr()->user[Fiasco::UTCB_TCR_THREAD_OBJ] = 0;
+
+void Genode::platform_main_bootstrap()
+{
+	static struct Bootstrap
+	{
+		enum { MAIN_THREAD_CAP_ID = 1 };
+
+		Bootstrap()
+		{
+			Cap_index *i(cap_map()->insert(MAIN_THREAD_CAP_ID, Fiasco::MAIN_THREAD_CAP));
+			Fiasco::l4_utcb_tcr()->user[Fiasco::UTCB_TCR_BADGE] = (unsigned long) i;
+			Fiasco::l4_utcb_tcr()->user[Fiasco::UTCB_TCR_THREAD_OBJ] = 0;
+		}
+	} bootstrap;
 }
-
-
-#endif /* _PLATFORM___MAIN_HELPER_H_ */

base-host/lib/mk/base-common.mk

@@ -8,7 +8,7 @@ LIBS += cxx
 
 SRC_CC += cap_copy.cc
 SRC_CC += ipc/ipc.cc ipc/ipc_marshal_cap.cc
-SRC_CC += pager/pager.cc
+SRC_CC += pager/pager.cc pager/common.cc
 SRC_CC += avl_tree/avl_tree.cc
 SRC_CC += allocator/slab.cc
 SRC_CC += allocator/allocator_avl.cc

base-host/src/base/ipc/ipc.cc

@@ -52,8 +52,8 @@ Ipc_istream::~Ipc_istream() { }
 void Ipc_client::_call() { }
 
 
-Ipc_client::Ipc_client(Native_capability const &srv,
-                       Msgbuf_base *snd_msg, Msgbuf_base *rcv_msg)
+Ipc_client::Ipc_client(Native_capability const &srv, Msgbuf_base *snd_msg,
+                       Msgbuf_base *rcv_msg, unsigned short)
 : Ipc_istream(rcv_msg), Ipc_ostream(srv, snd_msg), _result(0)
 { }
 

base-hw/include/arm/base/syscall_types.h

@@ -1,27 +0,0 @@
-/*
- * \brief  Syscall declarations specific for ARM V7A systems
- * \author Martin Stein
- * \date   2011-11-30
- */
-
-/*
- * Copyright (C) 2011-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.
- */
-
-#ifndef _INCLUDE__ARM__BASE__SYSCALL_H_
-#define _INCLUDE__ARM__BASE__SYSCALL_H_
-
-/* Genode includes */
-#include <base/stdint.h>
-
-namespace Kernel
-{
-	typedef Genode::uint32_t Syscall_arg;
-	typedef Genode::uint32_t Syscall_ret;
-}
-
-#endif /* _INCLUDE__ARM__BASE__SYSCALL_H_ */
-

base-hw/include/arm/kernel/interface_support.h

@@ -0,0 +1,66 @@
+/*
+ * \brief  Interface between kernel and userland
+ * \author Martin Stein
+ * \date   2011-11-30
+ */
+
+/*
+ * Copyright (C) 2011-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.
+ */
+
+#ifndef _KERNEL__INTERFACE_SUPPORT_H_
+#define _KERNEL__INTERFACE_SUPPORT_H_
+
+/* Genode includes */
+#include <base/stdint.h>
+
+namespace Kernel
+{
+	typedef Genode::uint32_t Call_arg;
+	typedef Genode::uint32_t Call_ret;
+
+	/**
+	 * Registers that are provided by a kernel thread-object for user access
+	 */
+	struct Thread_reg_id
+	{
+		enum {
+			R0            = 0,
+			R1            = 1,
+			R2            = 2,
+			R3            = 3,
+			R4            = 4,
+			R5            = 5,
+			R6            = 6,
+			R7            = 7,
+			R8            = 8,
+			R9            = 9,
+			R10           = 10,
+			R11           = 11,
+			R12           = 12,
+			SP            = 13,
+			LR            = 14,
+			IP            = 15,
+			CPSR          = 16,
+			CPU_EXCEPTION = 17,
+			FAULT_TLB     = 18,
+			FAULT_ADDR    = 19,
+			FAULT_WRITES  = 20,
+			FAULT_SIGNAL  = 21,
+		};
+	};
+
+	/**
+	 * Events that are provided by a kernel thread-object for user handling
+	 */
+	struct Thread_event_id
+	{
+		enum { FAULT = 0 };
+	};
+}
+
+#endif /* _KERNEL__INTERFACE_SUPPORT_H_ */
+

base-hw/include/base/ipc_pager.h

@@ -1,174 +0,0 @@
-/*
- * \brief  IPC backend for a Genode pager
- * \author Martin Stein
- * \date   2012-03-28
- */
-
-/*
- * Copyright (C) 2012-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.
- */
-
-#ifndef _INCLUDE__BASE__IPC_PAGER_H_
-#define _INCLUDE__BASE__IPC_PAGER_H_
-
-/* Genode includes */
-#include <base/thread.h>
-#include <base/ipc.h>
-#include <base/native_types.h>
-#include <kernel/log.h>
-
-namespace Genode
-{
-	class Pager_object;
-
-	/**
-	 * Translation of a virtual page frame
-	 */
-	struct Mapping
-	{
-		addr_t   virt_address;
-		addr_t   phys_address;
-		bool     write_combined;
-		bool     io_mem;
-		unsigned size_log2;
-		bool     writable;
-
-		/**
-		 * Construct valid mapping
-		 */
-		Mapping(addr_t const va, addr_t const pa, bool const wc,
-		        bool io, unsigned const sl2 = MIN_MAPPING_SIZE_LOG2,
-		        bool const w = 1)
-		:
-			virt_address(va), phys_address(pa), write_combined(wc),
-			io_mem(io), size_log2(sl2), writable(w)
-		{ }
-
-		/**
-		 * Construct invalid mapping
-		 */
-		Mapping() : size_log2(0) { }
-
-		/**
-		 * Dummy, all data is available since construction
-		 */
-		void prepare_map_operation() { }
-
-		/**
-		 * Validation
-		 */
-		bool valid() { return size_log2 > 0; }
-	};
-
-	/**
-	 * Message format for the acknowledgment of a resolved pagefault
-	 */
-	struct Pagefault_resolved
-	{
-		Native_thread_id const reply_dst;
-		Pager_object * const   pager_object;
-	};
-
-	/**
-	 * Special paging server class
-	 */
-	class Ipc_pager : public Native_capability
-	{
-		enum { VERBOSE = 1 };
-
-		Pagefault _pagefault; /* data of lastly received pagefault */
-		Mapping   _mapping; /* mapping to resolve last pagefault */
-
-		public:
-
-			/**
-			 * Constructor
-			 */
-			Ipc_pager() :
-				Native_capability(Genode::thread_get_my_native_id(), 0)
-			{
-				/* check if we can distinguish all message types */
-				if (sizeof(Pagefault) == sizeof(Pagefault_resolved))
-				{
-					kernel_log() << __PRETTY_FUNCTION__
-					             << ": Message types indiscernible\n";
-					while (1) ;
-				}
-			}
-
-			/**
-			 * Wait for the next pagefault request
-			 */
-			void wait_for_fault();
-
-			/**
-			 * Resolve current pagefault and wait for a new one
-			 */
-			void resolve_and_wait_for_fault();
-
-			/**
-			 * Request instruction pointer of current page fault
-			 */
-			addr_t fault_ip() { return _pagefault.virt_ip; }
-
-			/**
-			 * Request fault address of current page fault
-			 */
-			addr_t fault_addr() { return _pagefault.virt_address; }
-
-			/**
-			 * Set parameters for next reply
-			 */
-			void set_reply_mapping(Mapping m) { _mapping = m; }
-
-			/**
-			 * Set destination for next reply
-			 */
-			void set_reply_dst(Native_capability pager_object) {
-				kernel_log() << __PRETTY_FUNCTION__ << ": Not implemented\n";
-				while (1) ;
-			}
-
-			/**
-			 * Answer call without sending a flex-page mapping
-			 *
-			 * This function is used to acknowledge local calls from one of
-			 * core's region-manager sessions.
-			 */
-			void acknowledge_wakeup() {
-				kernel_log() << __PRETTY_FUNCTION__ << ": Not implemented\n";
-				while (1) ;
-			}
-
-			/**
-			 * Return thread ID of last faulter
-			 */
-			Native_thread_id last() const { return _pagefault.thread_id; }
-
-			/**
-			 * Return badge for faulting thread
-			 */
-			unsigned badge() const { return _pagefault.thread_id; }
-
-			/**
-			 * Return true if last fault was a write fault
-			 */
-			bool is_write_fault() const { return _pagefault.write; }
-
-			/**
-			 * Return true if last fault was an exception
-			 */
-			bool is_exception() const
-			{
-				kernel_log() << __PRETTY_FUNCTION__ << ": Not implemented\n";
-				while (1) ;
-				return false;
-			}
-	};
-}
-
-#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */
-

base-hw/include/base/native_types.h

@@ -1,5 +1,5 @@
 /*
- * \brief  Platform specific basic Genode types
+ * \brief  Basic Genode types
  * \author Martin Stein
  * \date   2012-01-02
  */
@@ -11,11 +11,11 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__BASE__NATIVE_TYPES_H_
-#define _INCLUDE__BASE__NATIVE_TYPES_H_
+#ifndef _BASE__NATIVE_TYPES_H_
+#define _BASE__NATIVE_TYPES_H_
 
 /* Genode includes */
-#include <kernel/syscalls.h>
+#include <kernel/interface.h>
 #include <base/native_capability.h>
 #include <base/stdint.h>
 
@@ -28,8 +28,8 @@ namespace Genode
 
 	struct Native_thread
 	{
-		Native_thread_id  tid;
-		Platform_thread  *pt;
+		Platform_thread  * platform_thread;
+		Native_thread_id   thread_id;
 	};
 
 	typedef int Native_connection_state;
@@ -38,72 +38,55 @@ namespace Genode
 	enum { MIN_MAPPING_SIZE_LOG2 = 12 };
 
 	/**
-	 * Get kernel-object identifier of the current thread
+	 * Return kernel thread-name of the caller
 	 */
-	inline Native_thread_id thread_get_my_native_id()
-	{ return Kernel::current_thread_id(); }
+	Native_thread_id thread_get_my_native_id();
 
 	/**
-	 * Get the thread ID, wich is handled as invalid by the kernel
+	 * Return an invalid kernel thread-name
 	 */
 	inline Native_thread_id thread_invalid_id() { return 0; }
 
 	/**
-	 * Describes a pagefault
+	 * Message that is communicated synchronously
 	 */
-	struct Pagefault
+	struct Msg
 	{
-		unsigned thread_id;    /* thread ID of the faulter */
-		Tlb *    tlb;          /* TLB to wich the faulter is assigned */
-		addr_t   virt_ip;      /* the faulters virtual instruction pointer */
-		addr_t   virt_address; /* virtual fault address */
-		bool     write;        /* write access attempted at fault? */
-
 		/**
-		 * Placement new operator
+		 * Types of synchronously communicated messages
 		 */
-		void * operator new (size_t, void * p) { return p; }
+		struct Type
+		{
+			enum Id {
+				INVALID = 0,
+				STARTUP = 1,
+				IPC     = 2,
+			};
+		};
 
-		/**
-		 * Construct invalid pagefault
-		 */
-		Pagefault() : thread_id(0) { }
-
-		/**
-		 * Construct valid pagefault
-		 */
-		Pagefault(unsigned const tid, Tlb * const tlb,
-		          addr_t const vip, addr_t const va, bool const w)
-		:
-			thread_id(tid), tlb(tlb), virt_ip(vip),
-			virt_address(va), write(w)
-		{ }
-
-		/**
-		 * Validation
-		 */
-		bool valid() const { return thread_id != 0; }
+		Type::Id type;
+		uint8_t  data[];
 	};
 
 	/**
-	 * Describes a userland-thread-context region
+	 * Message that is communicated between user threads
 	 */
-	struct Native_utcb
+	struct Ipc_msg : Msg
 	{
-		/* UTCB payload */
-		char payload[1<<MIN_MAPPING_SIZE_LOG2];
-
-		/**
-		 * Get the base of the UTCB
-		 */
-		void * base() { return payload; }
-
-		/**
-		 * Get the UTCB size
-		 */
-		size_t size() { return sizeof(payload); }
+		size_t  size;
+		uint8_t data[];
 	};
 
+	/**
+	 * Message that is communicated from a thread creator to the new thread
+	 */
+	class Startup_msg;
+
+	/**
+	 * Memory region that is exclusive to every thread and known by the kernel
+	 */
+	struct Native_utcb;
+
 	struct Cap_dst_policy
 	{
 		typedef Native_thread_id Dst;
@@ -128,7 +111,7 @@ namespace Genode
 	typedef Native_capability_tpl<Cap_dst_policy> Native_capability;
 
 	/**
-	 * A coherent address region
+	 * Coherent address region
 	 */
 	struct Native_region
 	{
@@ -153,5 +136,76 @@ namespace Genode
 	struct Native_pd_args { };
 }
 
-#endif /* _INCLUDE__BASE__NATIVE_TYPES_H_ */
+class Genode::Startup_msg : public Msg
+{
+	private:
+
+		Native_thread_id _thread_id;
+
+	public:
+
+		/**
+		 * Set-up valid startup message
+		 *
+		 * \param thread_id  kernel name of the thread that is started
+		 */
+		void init(Native_thread_id const thread_id)
+		{
+			_thread_id = thread_id;
+			type = Msg::Type::STARTUP;
+		}
+
+		/**
+		 * Return kernel name of started thread message-type-save
+		 */
+		Native_thread_id thread_id() const
+		{
+			if (type == Msg::Type::STARTUP) { return _thread_id; }
+			return thread_invalid_id();
+		}
+};
+
+struct Genode::Native_utcb
+{
+	union {
+		uint8_t     data[1 << MIN_MAPPING_SIZE_LOG2];
+		Msg         msg;
+		Ipc_msg     ipc_msg;
+		Startup_msg startup_msg;
+	};
+
+	void call_wait_for_request(void * & buf_base, size_t & buf_size)
+	{
+		msg.type = Msg::Type::INVALID;
+		buf_base = base();
+		buf_size = size();
+	}
+
+	void call_request_and_wait(void * & msg_base, size_t & msg_size,
+	                              void * & buf_base, size_t & buf_size)
+	{
+		msg.type = Msg::Type::IPC;
+		msg_base = ipc_msg_base();
+		msg_size = ipc_msg_size();
+		buf_base = base();
+		buf_size = size();
+	}
+
+	void call_reply(void * & msg_base, size_t & msg_size)
+	{
+		msg.type = Msg::Type::IPC;
+		msg_base = ipc_msg_base();
+		msg_size = ipc_msg_size();
+	}
+
+	size_t size() { return sizeof(data) / sizeof(data[0]); }
+	void * base() { return &data; }
+	addr_t top() { return (addr_t)base() + size(); }
+	void * ipc_msg_base() { return &ipc_msg; }
+	size_t ipc_msg_size() { return ipc_msg_header_size() + ipc_msg.size; }
+	size_t ipc_msg_max_size() { return top() - (addr_t)&ipc_msg; }
+	size_t ipc_msg_header_size() { return (addr_t)ipc_msg.data - (addr_t)&ipc_msg; }
+};
+
+#endif /* _BASE__NATIVE_TYPES_H_ */
 

base-hw/include/base/pager.h

@@ -0,0 +1,303 @@
+/*
+ * \brief  Paging framework
+ * \author Martin Stein
+ * \date   2013-11-07
+ */
+
+/*
+ * Copyright (C) 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.
+ */
+
+#ifndef _BASE__PAGER_H_
+#define _BASE__PAGER_H_
+
+/* Genode includes */
+#include <base/thread.h>
+#include <base/object_pool.h>
+#include <base/signal.h>
+#include <pager/capability.h>
+
+namespace Genode
+{
+	class Cap_session;
+
+	/**
+	 * Translation of a virtual page frame
+	 */
+	struct Mapping;
+
+	/**
+	 * Interface between the generic paging system and the base-hw backend
+	 */
+	class Ipc_pager;
+
+	/**
+	 * Represents a faulter and its paging context
+	 */
+	class Pager_object;
+
+	/**
+	 * Paging entry point that manages a pool of pager objects
+	 */
+	class Pager_entrypoint;
+
+	/**
+	 * A thread that processes one page fault of a pager object at a time
+	 */
+	class Pager_activation_base;
+
+	/**
+	 * Pager-activation base with custom stack size
+	 */
+	template <unsigned STACK_SIZE> class Pager_activation;
+}
+
+struct Genode::Mapping
+{
+	addr_t   virt_address;
+	addr_t   phys_address;
+	bool     write_combined;
+	bool     io_mem;
+	unsigned size_log2;
+	bool     writable;
+
+	/**
+	 * Constructor for invalid mappings
+	 */
+	Mapping();
+
+	/**
+	 * Constructor for valid mappings
+	 */
+	Mapping(addr_t const va, addr_t const pa, bool const wc,
+	        bool const io, unsigned const sl2, bool const w);
+
+	/**
+	 * Prepare for the application of the mapping
+	 */
+	void prepare_map_operation();
+};
+
+class Genode::Ipc_pager
+{
+	protected:
+
+		/**
+		 * Page-fault data that is read from the faulters thread registers
+		 */
+		struct Fault_thread_regs
+		{
+			addr_t tlb;
+			addr_t ip;
+			addr_t addr;
+			addr_t writes;
+			addr_t signal;
+		};
+
+		Fault_thread_regs _fault;
+		Mapping           _mapping;
+
+	public:
+
+		/**
+		 * Instruction pointer of current page fault
+		 */
+		addr_t fault_ip() const;
+
+		/**
+		 * Faulter-local fault address of current page fault
+		 */
+		addr_t fault_addr() const;
+
+		/**
+		 * Access direction of current page fault
+		 */
+		bool is_write_fault() const;
+
+		/**
+		 * Input mapping data as reply to current page fault
+		 */
+		void set_reply_mapping(Mapping m);
+};
+
+class Genode::Pager_object : public Object_pool<Pager_object>::Entry,
+                             public Signal_context
+{
+	friend class Pager_entrypoint;
+
+	private:
+
+		Signal_context_capability _signal_context_cap;
+		Thread_capability         _thread_cap;
+		char                      _signal_buf[sizeof(Signal)];
+		unsigned const            _badge;
+
+
+		/***************
+		 ** Accessors **
+		 ***************/
+
+		Signal * _signal() const;
+
+	public:
+
+		/**
+		 * Constructor
+		 *
+		 * \param badge  user identifaction of pager object
+		 */
+		Pager_object(unsigned const badge, Affinity::Location);
+
+		/**
+		 * Destructor
+		 */
+		virtual ~Pager_object() { }
+
+		/**
+		 * The faulter has caused a fault and awaits paging
+		 *
+		 * \param s  signal that communicated the fault
+		 */
+		void fault_occured(Signal const & s);
+
+		/**
+		 * Current fault has been resolved so resume faulter
+		 */
+		void fault_resolved();
+
+		/**
+		 * User identification of pager object
+		 */
+		unsigned badge() const;
+
+		/**
+		 * Resume faulter
+		 */
+		void wake_up();
+
+		/**
+		 * Unnecessary as base-hw doesn't use exception handlers
+		 */
+		void exception_handler(Signal_context_capability);
+
+
+		/******************
+		 ** Pure virtual **
+		 ******************/
+
+		/**
+		 * Request a mapping that resolves a fault directly
+		 *
+		 * \param p  offers the fault data and receives mapping data
+		 *
+		 * \retval   0  succeeded
+		 * \retval !=0  fault can't be received directly
+		 */
+		virtual int pager(Ipc_pager & p) = 0;
+
+
+		/***************
+		 ** Accessors **
+		 ***************/
+
+		Thread_capability thread_cap() const;
+
+		void thread_cap(Thread_capability const & c);
+
+		void cap(Native_capability const & c);
+
+		unsigned signal_context_id() const;
+};
+
+class Genode::Pager_activation_base : public Thread_base,
+                                      public Signal_receiver,
+                                      public Ipc_pager
+{
+	private:
+
+		Native_capability  _cap;
+		Lock               _cap_valid;
+		Pager_entrypoint * _ep;
+
+	public:
+
+		/**
+		 * Constructor
+		 *
+		 * \param name        name of the new thread
+		 * \param stack_size  stack size of the new thread
+		 */
+		Pager_activation_base(char const * const name,
+		                      size_t const stack_size);
+
+		/**
+		 * Bring current mapping data into effect
+		 *
+		 * \retval  0  succeeded
+		 * \retval -1  failed
+		 */
+		int apply_mapping();
+
+
+		/**********************
+		 ** Thread interface **
+		 **********************/
+
+		void entry();
+
+
+		/***************
+		 ** Accessors **
+		 ***************/
+
+		Native_capability cap();
+
+		void ep(Pager_entrypoint * const ep);
+};
+
+class Genode::Pager_entrypoint : public Object_pool<Pager_object>
+{
+	private:
+
+		Pager_activation_base * const _activation;
+
+	public:
+
+		/**
+		 * Constructor
+		 *
+		 * \param a  activation that shall handle the objects of the entrypoint
+		 */
+		Pager_entrypoint(Cap_session *, Pager_activation_base * const a);
+
+		/**
+		 * Associate pager object 'obj' with entry point
+		 */
+		Pager_capability manage(Pager_object * const obj);
+
+		/**
+		 * Dissolve pager object 'obj' from entry point
+		 */
+		void dissolve(Pager_object * const obj);
+};
+
+template <unsigned STACK_SIZE>
+class Genode::Pager_activation : public Pager_activation_base
+{
+	public:
+
+		/**
+		 * Constructor
+		 */
+		Pager_activation()
+		:
+			Pager_activation_base("pager_activation", STACK_SIZE)
+		{
+			start();
+		}
+};
+
+#endif /* _BASE__PAGER_H_ */

base-hw/include/cpu_session/connection.h

@@ -31,10 +31,11 @@ namespace Genode {
 		 * \param priority  designated priority of all threads created
 		 *                  with this CPU session
 		 */
-		Cpu_connection(const char *label = "", long priority = DEFAULT_PRIORITY)
+		Cpu_connection(const char *label = "", long priority = DEFAULT_PRIORITY,
+		               Affinity const &affinity = Affinity())
 		:
 			Connection<Cpu_session>(
-				session("priority=0x%lx, ram_quota=128K, label=\"%s\"",
+				session(affinity, "priority=0x%lx, ram_quota=128K, label=\"%s\"",
 				        priority, label)),
 			Cpu_session_client(cap()) { }
 	};

base-hw/include/irq_session/client.h

@@ -0,0 +1,62 @@
+/*
+ * \brief  Client-side IRQ session interface
+ * \author Martin Stein
+ * \date   2013-10-24
+ */
+
+/*
+ * Copyright (C) 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.
+ */
+
+#ifndef _IRQ_SESSION__CLIENT_H_
+#define _IRQ_SESSION__CLIENT_H_
+
+/* Genode includes */
+#include <irq_session/capability.h>
+#include <base/rpc_client.h>
+
+namespace Genode
+{
+	/**
+	 * Client-side IRQ session interface
+	 */
+	struct Irq_session_client : Rpc_client<Irq_session>
+	{
+		/*
+		 * FIXME: This is used only client-internal and could thus be protected.
+		 */
+		Irq_signal const irq_signal;
+
+		/**
+		 * Constructor
+		 *
+		 * \param session  pointer to the session backend
+		 */
+		explicit Irq_session_client(Irq_session_capability const & session)
+		:
+			Rpc_client<Irq_session>(session),
+			irq_signal(signal())
+		{ }
+
+
+		/*****************
+		 ** Irq_session **
+		 *****************/
+
+		Irq_signal signal() { return call<Rpc_signal>(); }
+
+		void wait_for_irq()
+		{
+			while (Kernel::await_signal(irq_signal.receiver_id,
+			                            irq_signal.context_id))
+			{
+				PERR("failed to receive interrupt");
+			}
+		}
+	};
+}
+
+#endif /* _IRQ_SESSION__CLIENT_H_ */

base-hw/include/irq_session/irq_session.h

@@ -0,0 +1,82 @@
+/*
+ * \brief  IRQ session interface
+ * \author Martin Stein
+ * \date   2013-10-24
+ */
+
+/*
+ * Copyright (C) 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.
+ */
+
+#ifndef _IRQ_SESSION__IRQ_SESSION_H_
+#define _IRQ_SESSION__IRQ_SESSION_H_
+
+/* Genode includes */
+#include <base/capability.h>
+#include <session/session.h>
+
+namespace Genode
+{
+	/**
+	 * Information that enables a user to await and ack an IRQ directly
+	 */
+	struct Irq_signal
+	{
+		unsigned receiver_id;
+		unsigned context_id;
+	};
+
+	/**
+	 * IRQ session interface
+	 */
+	struct Irq_session : Session
+	{
+		/**
+		 * Interrupt trigger
+		 */
+		enum Trigger { TRIGGER_UNCHANGED = 0, TRIGGER_LEVEL, TRIGGER_EDGE };
+
+		/**
+		 * Interrupt trigger polarity
+		 */
+		enum Polarity { POLARITY_UNCHANGED = 0, POLARITY_HIGH, POLARITY_LOW };
+
+		/**
+		 * Destructor
+		 */
+		virtual ~Irq_session() { }
+
+		/**
+		 * Await the next occurence of the interrupt of this session
+		 */
+		virtual void wait_for_irq() = 0;
+
+		/**
+		 * Get information for direct interrupt handling
+		 *
+		 * FIXME: This is used only client-internal and could thus be protected.
+		 */
+		virtual Irq_signal signal() = 0;
+
+
+		/*************
+		 ** Session **
+		 *************/
+
+		static const char * service_name() { return "IRQ"; }
+
+
+		/*********************
+		 ** RPC declaration **
+		 *********************/
+
+		GENODE_RPC(Rpc_wait_for_irq, void, wait_for_irq);
+		GENODE_RPC(Rpc_signal, Irq_signal, signal);
+		GENODE_RPC_INTERFACE(Rpc_wait_for_irq, Rpc_signal);
+	};
+}
+
+#endif /* _IRQ_SESSION__IRQ_SESSION_H_ */

base-hw/include/kernel/interface.h

@@ -0,0 +1,593 @@
+/*
+ * \brief  Interface between kernel and userland
+ * \author Martin stein
+ * \date   2011-11-30
+ */
+
+/*
+ * Copyright (C) 2011-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.
+ */
+
+#ifndef _KERNEL__INTERFACE_H_
+#define _KERNEL__INTERFACE_H_
+
+/* Genode includes */
+#include <kernel/interface_support.h>
+
+namespace Genode
+{
+	class Native_utcb;
+	class Platform_pd;
+	class Tlb;
+}
+
+namespace Kernel
+{
+	typedef Genode::Tlb             Tlb;
+	typedef Genode::addr_t          addr_t;
+	typedef Genode::size_t          size_t;
+	typedef Genode::Platform_pd     Platform_pd;
+	typedef Genode::Native_utcb     Native_utcb;
+
+	/**
+	 * Kernel names of all kernel calls
+	 */
+	struct Call_id
+	{
+		enum {
+			NEW_THREAD           = 0,
+			KILL_THREAD          = 1,
+			START_THREAD         = 2,
+			PAUSE_THREAD         = 3,
+			RESUME_THREAD        = 4,
+			YIELD_THREAD         = 5,
+			ACCESS_THREAD_REGS   = 6,
+			ROUTE_THREAD_EVENT   = 7,
+			UPDATE_PD            = 8,
+			UPDATE_REGION        = 9,
+			NEW_PD               = 10,
+			KILL_PD              = 11,
+			REQUEST_AND_WAIT     = 12,
+			REPLY                = 13,
+			WAIT_FOR_REQUEST     = 14,
+			NEW_SIGNAL_RECEIVER  = 15,
+			NEW_SIGNAL_CONTEXT   = 16,
+			KILL_SIGNAL_CONTEXT  = 17,
+			KILL_SIGNAL_RECEIVER = 18,
+			SUBMIT_SIGNAL        = 19,
+			AWAIT_SIGNAL         = 20,
+			SIGNAL_PENDING       = 21,
+			ACK_SIGNAL           = 22,
+			NEW_VM               = 23,
+			RUN_VM               = 24,
+			PAUSE_VM             = 25,
+			PRINT_CHAR           = 26,
+		};
+	};
+
+
+	/*****************************************************************
+	 ** Kernel call with 1 to 6 arguments                           **
+	 **                                                             **
+	 ** These functions must not be inline to ensure that objects,  **
+	 ** wich are referenced by arguments, are tagged as "used" even **
+	 ** though only the pointer gets handled in here.               **
+	 *****************************************************************/
+
+	Call_ret call(Call_arg arg_0);
+
+	Call_ret call(Call_arg arg_0,
+	              Call_arg arg_1);
+
+	Call_ret call(Call_arg arg_0,
+	              Call_arg arg_1,
+	              Call_arg arg_2);
+
+	Call_ret call(Call_arg arg_0,
+	              Call_arg arg_1,
+	              Call_arg arg_2,
+	              Call_arg arg_3);
+
+	Call_ret call(Call_arg arg_0,
+	              Call_arg arg_1,
+	              Call_arg arg_2,
+	              Call_arg arg_3,
+	              Call_arg arg_4);
+
+	Call_ret call(Call_arg arg_0,
+	              Call_arg arg_1,
+	              Call_arg arg_2,
+	              Call_arg arg_3,
+	              Call_arg arg_4,
+	              Call_arg arg_5);
+
+	/**
+	 * Virtual range of the mode transition region in every PD
+	 */
+	addr_t mode_transition_virt_base();
+	size_t mode_transition_size();
+
+	/**
+	 * Get sizes of the kernel objects
+	 */
+	size_t thread_size();
+	size_t pd_size();
+	size_t signal_context_size();
+	size_t signal_receiver_size();
+	size_t vm_size();
+
+	/**
+	 * Get alignment constraints of the kernel objects
+	 */
+	unsigned kernel_pd_alignm_log2();
+
+
+	/**
+	 * Create a protection domain
+	 *
+	 * \param p   appropriate memory donation for the kernel object
+	 * \param pd  core local Platform_pd object
+	 *
+	 * \retval >0  kernel name of the new protection domain
+	 * \retval  0  failed
+	 *
+	 * Restricted to core threads. Regaining of the supplied memory is not
+	 * supported by now.
+	 */
+	inline unsigned new_pd(void * const dst, Platform_pd * const pd)
+	{
+		return call(Call_id::NEW_PD, (Call_arg)dst, (Call_arg)pd);
+	}
+
+
+	/**
+	 * Destruct a protection domain
+	 *
+	 * \param pd_id  kernel name of the targeted protection domain
+	 *
+	 * \retval  0  succeeded
+	 * \retval -1  failed
+	 */
+	inline int kill_pd(unsigned const pd_id)
+	{
+		return call(Call_id::KILL_PD, pd_id);
+	}
+
+
+	/**
+	 * Propagate changes in PD configuration
+	 *
+	 * \param pd_id  ID of the PD that has been configured
+	 *
+	 * It might be, that the kernel and/or the hardware caches parts of PD
+	 * configurations such as virtual address translations. This function
+	 * ensures that the current configuration of the targeted PD gets fully
+	 * applied from the moment it returns to the userland. This function is
+	 * inappropriate in case that a PD wants to change its own configuration.
+	 * There's no need for this function after a configuration change that
+	 * can't affect the kernel- and/or hardware-caches.
+	 *
+	 * Restricted to core threads.
+	 */
+	inline void update_pd(unsigned const pd_id)
+	{
+		call(Call_id::UPDATE_PD, pd_id);
+	}
+
+
+	/**
+	 * Propagate memory-updates within a given virtual region
+	 *
+	 * \param base  virtual base of the region
+	 * \param size  size of the region
+	 *
+	 * If one updates a memory region and must ensure that the update
+	 * gets visible directly to other address spaces, this function does
+	 * the job.
+	 *
+	 * Restricted to core threads.
+	 */
+	inline void update_region(addr_t const base, size_t const size)
+	{
+		call(Call_id::UPDATE_REGION, (Call_arg)base, (Call_arg)size);
+	}
+
+
+	/**
+	 * Create kernel object that acts as thread that isn't executed initially
+	 *
+	 * \param p         memory donation for the new kernel thread object
+	 * \param priority  scheduling priority of the new thread
+	 * \param label     debugging label of the new thread
+	 *
+	 * \retval >0  kernel name of the new thread
+	 * \retval  0  failed
+	 *
+	 * Restricted to core threads.
+	 */
+	inline int new_thread(void * const p, unsigned const priority,
+	                      char const * const label)
+	{
+		return call((Call_arg)Call_id::NEW_THREAD, (Call_arg)p, (Call_arg)priority,
+		            (Call_arg)label);
+	}
+
+
+	/**
+	 * Destruct kernel thread-object
+	 *
+	 * \param thread_id  kernel name of the targeted thread
+	 *
+	 * Restricted to core threads.
+	 */
+	inline void kill_thread(unsigned const thread_id)
+	{
+		call(Call_id::KILL_THREAD, thread_id);
+	}
+
+
+	/**
+	 * Start executing a thread
+	 *
+	 * \param thread_id  kernel name of targeted thread
+	 * \param cpu_id     kernel name of targeted processor
+	 * \param pd_id      kernel name of targeted protection domain
+	 * \param utcb       core local pointer to userland thread-context
+	 *
+	 * Restricted to core threads.
+	 */
+	inline Tlb * start_thread(unsigned const thread_id, unsigned const cpu_id,
+	                          unsigned const pd_id, Native_utcb * const utcb)
+	{
+		return (Tlb *)call(Call_id::START_THREAD, thread_id, cpu_id, pd_id,
+		                   (Call_arg)utcb);
+	}
+
+
+	/**
+	 * Prevent thread from participating in CPU scheduling
+	 *
+	 * \param thread_id  kernel name of the targeted thread or 0
+	 *
+	 * \retval  0  succeeded
+	 * \retval -1  the targeted thread does not exist or is still active
+	 *
+	 * If thread_id is set to 0 the caller targets itself. If the caller
+	 * doesn't target itself, the call is restricted to core threads.
+	 */
+	inline int pause_thread(unsigned const thread_id)
+	{
+		return call(Call_id::PAUSE_THREAD, thread_id);
+	}
+
+
+	/**
+	 * Let an already started thread participate in CPU scheduling
+	 *
+	 * \param thread_id  kernel name of the targeted thread
+	 *
+	 * \retval  0  succeeded and thread was paused beforehand
+	 * \retval  1  succeeded and thread was active beforehand
+	 * \retval -1  failed
+	 *
+	 * If the targeted thread blocks for any event except a 'start_thread'
+	 * call this call cancels the blocking.
+	 */
+	inline int resume_thread(unsigned const thread_id)
+	{
+		return call(Call_id::RESUME_THREAD, thread_id);
+	}
+
+
+	/**
+	 * Let the current thread give up its remaining timeslice
+	 *
+	 * \param thread_id  kernel name of the benefited thread
+	 *
+	 * If thread_id is valid the call will resume the targeted thread
+	 * additionally.
+	 */
+	inline void yield_thread(unsigned const thread_id)
+	{
+		call(Call_id::YIELD_THREAD, thread_id);
+	}
+
+
+	/**
+	 * Set or unset the handler of an event a kernel thread-object triggers
+	 *
+	 * \param thread_id          kernel name of the targeted thread
+	 * \param event_id           kernel name of the targeted thread event
+	 * \param signal_context_id  kernel name of the handlers signal context
+	 *
+	 * Restricted to core threads.
+	 */
+	inline int route_thread_event(unsigned const thread_id,
+	                              unsigned const event_id,
+	                              unsigned const signal_context_id)
+	{
+		return call(Call_id::ROUTE_THREAD_EVENT, thread_id,
+		            event_id, signal_context_id);
+	}
+
+
+	/**
+	 * Send IPC request and await corresponding IPC reply
+	 *
+	 * \param id  kernel name of the server thread
+	 *
+	 * As soon as call returns, callers UTCB provides received message.
+	 */
+	inline void request_and_wait(unsigned const id)
+	{
+		call(Call_id::REQUEST_AND_WAIT, id);
+	}
+
+
+	/**
+	 * Await the receipt of a message
+	 *
+	 * \return  type of received message
+	 *
+	 * As soon as call returns, callers UTCB provides received message.
+	 */
+	inline void wait_for_request()
+	{
+		call(Call_id::WAIT_FOR_REQUEST);
+	}
+
+
+	/**
+	 * Reply to lastly received message
+	 *
+	 * \param await_message  wether the call shall await receipt of a message
+	 *
+	 * If await_request = 1, callers UTCB provides received message
+	 * as soon as call returns
+	 */
+	inline void reply(bool const await_message)
+	{
+		call(Call_id::REPLY, await_message);
+	}
+
+
+	/**
+	 * Print a char 'c' to the kernels serial ouput
+	 */
+	inline void print_char(char const c)
+	{
+		call(Call_id::PRINT_CHAR, c);
+	}
+
+
+	/**
+	 * Access plain member variables of a kernel thread-object
+	 *
+	 * \param thread_id     kernel name of the targeted thread
+	 * \param reads         amount of read operations
+	 * \param writes        amount of write operations
+	 * \param read_values   base of value buffer for read operations
+	 * \param write_values  base of value buffer for write operations
+	 *
+	 * \retval  0  all operations done
+	 * \retval >0  amount of undone operations
+	 * \retval -1  failed to start processing operations
+	 *
+	 * Restricted to core threads. Operations are processed in order of the
+	 * appearance of the register names in the callers UTCB. If reads = 0,
+	 * read_values is of no relevance. If writes = 0, write_values is of no
+	 * relevance.
+	 *
+	 * Expected structure at the callers UTCB base:
+	 *
+	 *                    0 * sizeof(addr_t): read register name #1
+	 *                  ...                   ...
+	 *          (reads - 1) * sizeof(addr_t): read register name #reads
+	 *          (reads - 0) * sizeof(addr_t): write register name #1
+	 *                  ...                   ...
+	 * (reads + writes - 1) * sizeof(addr_t): write register name #writes
+	 *
+	 * Expected structure at write_values:
+	 *
+	 *                    0 * sizeof(addr_t): write value #1
+	 *                  ...                   ...
+	 *         (writes - 1) * sizeof(addr_t): write value #writes
+	 */
+	inline int access_thread_regs(unsigned const thread_id,
+	                              unsigned const reads,
+	                              unsigned const writes,
+	                              addr_t * const read_values,
+	                              addr_t * const write_values)
+	{
+		return call(Call_id::ACCESS_THREAD_REGS, thread_id, reads, writes,
+		            (Call_arg)read_values, (Call_arg)write_values);
+	}
+
+
+	/**
+	 * Create a kernel object that acts as a signal receiver
+	 *
+	 * \param p  memory donation for the kernel signal-receiver object
+	 *
+	 * \retval >0  kernel name of the new signal receiver
+	 * \retval  0  failed
+	 *
+	 * Restricted to core threads.
+	 */
+	inline unsigned new_signal_receiver(addr_t const p)
+	{
+		return call(Call_id::NEW_SIGNAL_RECEIVER, p);
+	}
+
+
+	/**
+	 * Create kernel object that acts as a signal context and assign it
+	 *
+	 * \param p         memory donation for the kernel signal-context object
+	 * \param receiver  kernel name of targeted signal receiver
+	 * \param imprint   user label of the signal context
+	 *
+	 * \retval >0  kernel name of the new signal context
+	 * \retval  0  failed
+	 *
+	 * Restricted to core threads.
+	 */
+	inline unsigned new_signal_context(addr_t const   p,
+	                                   unsigned const receiver,
+	                                   unsigned const imprint)
+	{
+		return call(Call_id::NEW_SIGNAL_CONTEXT, p, receiver, imprint);
+	}
+
+
+	/**
+	 * Await any context of a receiver and optionally ack a context before
+	 *
+	 * \param receiver_id  kernel name of the targeted signal receiver
+	 * \param context_id   kernel name of a context that shall be acknowledged
+	 *
+	 * \retval  0  suceeded
+	 * \retval -1  failed
+	 *
+	 * If context is set to 0, the call doesn't acknowledge any context.
+	 * If this call returns 0, an instance of 'Signal::Data' is located at the
+	 * base of the callers UTCB. Every occurence of a signal is provided
+	 * through this function until it gets delivered through this function or
+	 * context respectively receiver get destructed. If multiple threads
+	 * listen at the same receiver, and/or multiple contexts of the receiver
+	 * trigger simultanously, there is no assertion about wich thread
+	 * receives, and from wich context. A context that delivered once doesn't
+	 * deliver again unless its last delivery has been acknowledged via
+	 * ack_signal.
+	 */
+	inline int await_signal(unsigned const receiver_id,
+	                        unsigned const context_id)
+	{
+		return call(Call_id::AWAIT_SIGNAL, receiver_id, context_id);
+	}
+
+
+	/**
+	 * Return wether any context of a receiver is pending
+	 *
+	 * \param receiver  kernel name of the targeted signal receiver
+	 *
+	 * \retval 0  none of the contexts is pending or the receiver doesn't exist
+	 * \retval 1  a context of the signal receiver is pending
+	 */
+	inline bool signal_pending(unsigned const receiver)
+	{
+		return call(Call_id::SIGNAL_PENDING, receiver);
+	}
+
+
+	/**
+	 * Trigger a specific signal context
+	 *
+	 * \param context  kernel name of the targeted signal context
+	 * \param num      how often the context shall be triggered by this call
+	 *
+	 * \retval  0  suceeded
+	 * \retval -1  failed
+	 */
+	inline int submit_signal(unsigned const context, unsigned const num)
+	{
+		return call(Call_id::SUBMIT_SIGNAL, context, num);
+	}
+
+
+	/**
+	 * Acknowledge the processing of the last delivery of a signal context
+	 *
+	 * \param context  kernel name of the targeted signal context
+	 */
+	inline void ack_signal(unsigned const context)
+	{
+		call(Call_id::ACK_SIGNAL, context);
+	}
+
+
+	/**
+	 * Destruct a signal context
+	 *
+	 * \param context  kernel name of the targeted signal context
+	 *
+	 * \retval  0  suceeded
+	 * \retval -1  failed
+	 *
+	 * Restricted to core threads.
+	 */
+	inline int kill_signal_context(unsigned const context)
+	{
+		return call(Call_id::KILL_SIGNAL_CONTEXT, context);
+	}
+
+
+	/**
+	 * Destruct a signal receiver
+	 *
+	 * \param receiver  kernel name of the targeted signal receiver
+	 *
+	 * \retval  0  suceeded
+	 * \retval -1  failed
+	 *
+	 * Restricted to core threads.
+	 */
+	inline int kill_signal_receiver(unsigned const receiver)
+	{
+		return call(Call_id::KILL_SIGNAL_RECEIVER, receiver);
+	}
+
+
+	/**
+	 * Create a virtual machine that is stopped initially
+	 *
+	 * \param dst                memory donation for the kernel VM-object
+	 * \param state              location of the CPU state of the VM
+	 * \param signal_context_id  kernel name of the signal context for VM events
+	 *
+	 * \retval >0  kernel name of the new VM
+	 * \retval  0  failed
+	 *
+	 * Restricted to core threads. Regaining of the supplied memory is not
+	 * supported by now.
+	 */
+	inline int new_vm(void * const dst, void * const state,
+	                  unsigned const signal_context_id)
+	{
+		return call(Call_id::NEW_VM, (Call_arg)dst, (Call_arg)state,
+		            signal_context_id);
+	}
+
+
+	/**
+	 * Execute a virtual-machine (again)
+	 *
+	 * \param vm_id  kernel name of the targeted VM
+	 *
+	 * Restricted to core threads.
+	 */
+	inline void run_vm(unsigned const vm_id)
+	{
+		call(Call_id::RUN_VM, vm_id);
+	}
+
+
+	/**
+	 * Stop execution of a virtual-machine
+	 *
+	 * \param vm_id  kernel name of the targeted VM
+	 *
+	 * Restricted to core threads.
+	 */
+	inline void pause_vm(unsigned const vm_id)
+	{
+		call(Call_id::PAUSE_VM, vm_id);
+	}
+}
+
+#endif /* _KERNEL__INTERFACE_H_ */
+

base-hw/include/kernel/log.h

@@ -11,11 +11,11 @@
  * under the terms of the GNU General Public License version 2.
  */
 
-#ifndef _INCLUDE__KERNEL__LOG_H_
-#define _INCLUDE__KERNEL__LOG_H_
+#ifndef _KERNEL__LOG_H_
+#define _KERNEL__LOG_H_
 
 /* Genode includes */
-#include <kernel/syscalls.h>
+#include <kernel/interface.h>
 
 namespace Genode
 {
@@ -105,5 +105,5 @@ namespace Genode
 	}
 }
 
-#endif /* _INCLUDE__KERNEL__LOG_H_  */
+#endif /* _KERNEL__LOG_H_  */
 

base-hw/include/kernel/perf_counter.h

@@ -0,0 +1,31 @@
+/*
+ * \brief   Performance counter specific functions
+ * \author  Josef Soentgen
+ * \date    2013-09-26
+ */
+
+/*
+ * Copyright (C) 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.
+ */
+
+#ifndef _PERF_COUNTER_H_
+#define _PERF_COUNTER_H_
+
+namespace Kernel {
+
+	class Perf_counter
+	{
+		public:
+
+			void enable();
+	};
+
+
+	extern Perf_counter *perf_counter();
+
+}
+
+#endif /* _PERF_COUNTER_H_ */

base-hw/include/kernel/syscalls.h

@@ -1,584 +0,0 @@
-/*
- * \brief  Kernels syscall frontend
- * \author Martin stein
- * \date   2011-11-30
- */
-
-/*
- * Copyright (C) 2011-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.
- */
-
-#ifndef _INCLUDE__KERNEL__SYSCALLS_H_
-#define _INCLUDE__KERNEL__SYSCALLS_H_
-
-/* Genode includes */
-#include <base/syscall_types.h>
-
-namespace Genode
-{
-	class Platform_thread;
-	class Platform_pd;
-	class Tlb;
-}
-
-namespace Kernel
-{
-	typedef Genode::Tlb             Tlb;
-	typedef Genode::addr_t          addr_t;
-	typedef Genode::size_t          size_t;
-	typedef Genode::Platform_thread Platform_thread;
-	typedef Genode::Platform_pd     Platform_pd;
-
-	/**
-	 * Unique opcodes of all syscalls supported by the kernel
-	 */
-	enum Syscall_type
-	{
-		INVALID_SYSCALL = 0,
-
-		/* execution control */
-		NEW_THREAD = 1,
-		DELETE_THREAD = 26,
-		START_THREAD = 2,
-		PAUSE_THREAD = 3,
-		RESUME_THREAD = 4,
-		RESUME_FAULTER = 28,
-		GET_THREAD = 5,
-		CURRENT_THREAD_ID = 6,
-		YIELD_THREAD = 7,
-		READ_THREAD_STATE = 18,
-		WRITE_THREAD_STATE = 19,
-
-		/* interprocess communication */
-		REQUEST_AND_WAIT = 8,
-		REPLY = 9,
-		WAIT_FOR_REQUEST = 10,
-
-		/* management of resource protection-domains */
-		SET_PAGER = 11,
-		UPDATE_PD = 12,
-		UPDATE_REGION = 32,
-		NEW_PD = 13,
-
-		/* interrupt handling */
-		ALLOCATE_IRQ = 14,
-		AWAIT_IRQ = 15,
-		FREE_IRQ = 16,
-
-		/* debugging */
-		PRINT_CHAR = 17,
-
-		/* asynchronous signalling */
-		NEW_SIGNAL_RECEIVER = 20,
-		NEW_SIGNAL_CONTEXT = 21,
-		KILL_SIGNAL_CONTEXT = 30,
-		AWAIT_SIGNAL = 22,
-		SUBMIT_SIGNAL = 23,
-		SIGNAL_PENDING = 27,
-		ACK_SIGNAL = 29,
-
-		/* vm specific */
-		NEW_VM   = 24,
-		RUN_VM   = 25,
-		PAUSE_VM = 31,
-	};
-
-	/*****************************************************************
-	 ** Syscall with 1 to 6 arguments                               **
-	 **                                                             **
-	 ** These functions must not be inline to ensure that objects,  **
-	 ** wich are referenced by arguments, are tagged as "used" even **
-	 ** though only the pointer gets handled in here.               **
-	 *****************************************************************/
-
-	Syscall_ret syscall(Syscall_arg arg_0);
-
-	Syscall_ret syscall(Syscall_arg arg_0,
-	                    Syscall_arg arg_1);
-
-	Syscall_ret syscall(Syscall_arg arg_0,
-	                    Syscall_arg arg_1,
-	                    Syscall_arg arg_2);
-
-	Syscall_ret syscall(Syscall_arg arg_0,
-	                    Syscall_arg arg_1,
-	                    Syscall_arg arg_2,
-	                    Syscall_arg arg_3);
-
-	Syscall_ret syscall(Syscall_arg arg_0,
-	                    Syscall_arg arg_1,
-	                    Syscall_arg arg_2,
-	                    Syscall_arg arg_3,
-	                    Syscall_arg arg_4);
-
-	Syscall_ret syscall(Syscall_arg arg_0,
-	                    Syscall_arg arg_1,
-	                    Syscall_arg arg_2,
-	                    Syscall_arg arg_3,
-	                    Syscall_arg arg_4,
-	                    Syscall_arg arg_5);
-
-	/**
-	 * Virtual range of the mode transition region in every PD
-	 */
-	addr_t mode_transition_virt_base();
-	size_t mode_transition_size();
-
-	/**
-	 * Get sizes of the kernel objects
-	 */
-	size_t thread_size();
-	size_t pd_size();
-	size_t signal_context_size();
-	size_t signal_receiver_size();
-	size_t vm_size();
-
-	/**
-	 * Get alignment constraints of the kernel objects
-	 */
-	unsigned kernel_pd_alignm_log2();
-
-
-	/**
-	 * Create a new PD
-	 *
-	 * \param dst  physical base of an appropriate portion of memory
-	 *             that is thereupon allocated to the kernel
-	 * \param pd   core local Platform_pd object
-	 *
-	 * \retval >0  ID of the new PD
-	 * \retval  0  if no new PD was created
-	 *
-	 * Restricted to core threads. Regaining of the supplied memory is not
-	 * supported by now.
-	 */
-	inline int new_pd(void * const dst, Platform_pd * const pd) {
-		return syscall(NEW_PD, (Syscall_arg)dst, (Syscall_arg)pd); }
-
-
-	/**
-	 * Propagate changes in PD configuration
-	 *
-	 * \param pd_id  ID of the PD that has been configured
-	 *
-	 * It might be, that the kernel and/or the hardware caches parts of PD
-	 * configurations such as virtual address translations. This syscall
-	 * ensures that the current configuration of the targeted PD gets fully
-	 * applied from the moment it returns to the userland. This syscall is
-	 * inappropriate in case that a PD wants to change its own configuration.
-	 * There's no need for this syscall after a configuration change that
-	 * can't affect the kernel- and/or hardware-caches.
-	 *
-	 * Restricted to core threads.
-	 */
-	inline void update_pd(unsigned const pd_id) {
-		syscall(UPDATE_PD, (Syscall_arg)pd_id); }
-
-	/**
-	 * Propagate memory-updates within a given virtual region
-	 *
-	 * \param base  virtual base of the region
-	 * \param size  size of the region
-	 *
-	 * If one updates a memory region and must ensure that the update
-	 * gets visible directly to other address spaces, this syscall does
-	 * the job.
-	 *
-	 * Restricted to core threads.
-	 */
-	inline void update_region(addr_t base, size_t size) {
-		syscall(UPDATE_REGION, (Syscall_arg)base, (Syscall_arg)size); }
-
-	/**
-	 * Create a new thread that is stopped initially
-	 *
-	 * \param dst  physical base of an appropriate portion of memory
-	 *             that is thereupon allocated to the kernel
-	 * \param pt   assigned platform thread
-	 *
-	 * \retval >0  ID of the new thread
-	 * \retval  0  if no new thread was created
-	 *
-	 * Restricted to core threads. Regaining of the supplied memory can be done
-	 * through 'delete_thread'.
-	 */
-	inline int
-	new_thread(void * const dst, Platform_thread * const pt) {
-		return syscall(NEW_THREAD, (Syscall_arg)dst, (Syscall_arg)pt); }
-
-	/**
-	 * Delete an existing thread
-	 *
-	 * \param id  kernel name of the targeted thread
-	 *
-	 * Restricted to core threads. After calling this, the memory that was
-	 * granted beforehand by 'new_thread' to kernel for managing this thread
-	 * is freed again.
-	 */
-	inline void delete_thread(unsigned thread_id) {
-		syscall(DELETE_THREAD, (Syscall_arg)thread_id); }
-
-	/**
-	 * Start thread with a given context and let it participate in CPU scheduling
-	 *
-	 * \param id  ID of targeted thread
-	 * \param ip  initial instruction pointer
-	 * \param sp  initial stack pointer
-	 *
-	 * \retval >0  success, return value is the TLB of the thread
-	 * \retval  0  the targeted thread wasn't started or was already started
-	 *             when this gets called (in both cases it remains untouched)
-	 *
-	 * Restricted to core threads.
-	 */
-	inline Tlb * start_thread(Platform_thread * const phys_pt, void * ip,
-	                          void * sp, unsigned cpu_no)
-	{
-		return (Tlb *)syscall(START_THREAD, (Syscall_arg)phys_pt,
-		                              (Syscall_arg)ip, (Syscall_arg)sp,
-		                              (Syscall_arg)cpu_no);
-	}
-
-
-	/**
-	 * Prevent thread from participating in CPU scheduling
-	 *
-	 * \param id  ID of the targeted thread. If not set
-	 *            this will target the current thread.
-	 *
-	 * \retval  0  syscall was successful
-	 * \retval <0  if the targeted thread does not exist or still participates
-	 *             in CPU scheduling after
-	 *
-	 * If the caller doesn't target itself, this is restricted to core threads.
-	 */
-	inline int pause_thread(unsigned const id = 0) {
-		return syscall(PAUSE_THREAD, id); }
-
-
-	/**
-	 * Let an already started thread participate in CPU scheduling
-	 *
-	 * \param id  ID of the targeted thread
-	 *
-	 * \retval  0  if syscall was successful and thread were paused beforehand
-	 * \retval >0  if syscall was successful and thread were already active
-	 * \retval <0  if targeted thread doesn't participate in CPU
-	 *             scheduling after
-	 *
-	 * If the targeted thread blocks for any event except a 'start_thread'
-	 * call this call cancels the blocking.
-	 */
-	inline int resume_thread(unsigned const id = 0) {
-		return syscall(RESUME_THREAD, id); }
-
-
-	/**
-	 * Continue thread after a pagefault that could be resolved
-	 *
-	 * \param id  ID of the targeted thread
-	 */
-	inline void resume_faulter(unsigned const id = 0) {
-		syscall(RESUME_FAULTER, id); }
-
-
-	/**
-	 * Let the current thread give up its remaining timeslice
-	 *
-	 * \param id  if this thread ID is set and valid this will resume the
-	 *            targeted thread additionally
-	 */
-	inline void yield_thread(unsigned const id = 0) {
-		syscall(YIELD_THREAD, id); }
-
-
-	/**
-	 * Get the thread ID of the current thread
-	 */
-	inline int current_thread_id() { return syscall(CURRENT_THREAD_ID); }
-
-
-	/**
-	 * Get platform thread by ID or 0 if target is "core main" or "idle"
-	 *
-	 * \param id  ID of the targeted thread or 0 if caller targets itself
-	 *
-	 * Restricted to core threads.
-	 */
-	inline Platform_thread * get_thread(unsigned const id = 0) {
-		return (Platform_thread *)syscall(GET_THREAD, id); }
-
-
-	/**
-	 * Send IPC request and wait for reply
-	 *
-	 * \param id    ID of the receiver thread
-	 * \param size  request size (beginning with the callers UTCB base)
-	 *
-	 * \return  size of received reply (beginning with the callers UTCB base)
-	 *
-	 * If the receiver exists, this blocks execution until a dedicated reply
-	 * message has been send by the receiver. The receiver may never do so.
-	 */
-	inline size_t request_and_wait(unsigned const id, size_t const size) {
-		return (size_t)syscall(REQUEST_AND_WAIT, id, size); }
-
-
-	/**
-	 * Wait for next IPC request, discard current request
-	 *
-	 * \return  size of received request (beginning with the callers UTCB base)
-	 */
-	inline size_t wait_for_request() {
-		return (size_t)syscall(WAIT_FOR_REQUEST); }
-
-
-	/**
-	 * Reply to last IPC request
-	 *
-	 * \param size           reply size (beginning with the callers UTCB base)
-	 * \param await_request  if the call shall await and fetch next request
-	 *
-	 * \return  request size (beginning with the callers UTCB base)
-	 *          if await_request was set
-	 */
-	inline size_t reply(size_t const size, bool const await_request) {
-		return (size_t)syscall(REPLY, size, await_request); }
-
-
-	/**
-	 * Set a thread that gets informed about pagefaults of another thread
-	 *
-	 * \param pager_id    ID of the thread that shall get informed.
-	 *                    Subsequently this thread gets an IPC message,
-	 *                    wich contains an according 'Pagefault' object for
-	 *                    every pagefault the faulter throws.
-	 * \param faulter_id  ID of the thread that throws the pagefaults
-	 *                    wich shall be notified. After every pagefault this
-	 *                    thread remains paused to be reactivated by
-	 *                    'resume_thread'.
-	 *
-	 * Restricted to core threads.
-	 */
-	inline void set_pager(unsigned const pager_id, unsigned const faulter_id) {
-		syscall(SET_PAGER, pager_id, faulter_id); }
-
-	/**
-	 * Print a char 'c' to the kernels serial ouput
-	 */
-	inline void print_char(char const c)
-	{ syscall(PRINT_CHAR, (Syscall_arg)c); }
-
-	/**
-	 * Allocate an IRQ to the caller if the IRQ is not allocated already
-	 *
-	 * \param id  ID of the targeted IRQ
-	 *
-	 * \return  wether the IRQ has been allocated to this thread or not
-	 *
-	 * Restricted to core threads.
-	 */
-	inline bool allocate_irq(unsigned const id) {
-		return syscall(ALLOCATE_IRQ, (Syscall_arg)id); }
-
-
-	/**
-	 * Free an IRQ from allocation if it is allocated by the caller
-	 *
-	 * \param id  ID of the targeted IRQ
-	 *
-	 * \return  wether the IRQ has been freed or not
-	 *
-	 * Restricted to core threads.
-	 */
-	inline bool free_irq(unsigned const id)	{
-		return syscall(FREE_IRQ, (Syscall_arg)id); }
-
-
-	/**
-	 * Block caller for the occurence of its IRQ
-	 *
-	 * Restricted to core threads. Blocks the caller forever
-	 * if he has not allocated any IRQ.
-	 */
-	inline void await_irq() { syscall(AWAIT_IRQ); }
-
-
-	/**
-	 * Copy the current state of a thread to the callers UTCB
-	 *
-	 * \param thread_id  ID of the targeted thread
-	 *
-	 * Restricted to core threads. One can also read from its own context,
-	 * or any thread that is active in the meantime. In these cases
-	 * be aware of the fact, that the result reflects the thread
-	 * state that were backed at the last kernel entry of the thread.
-	 * The copy might be incoherent when this function returns because
-	 * the caller might get scheduled away before then.
-	 */
-	inline void read_thread_state(unsigned const thread_id) {
-		syscall(READ_THREAD_STATE, (Syscall_arg)thread_id); }
-
-
-	/**
-	 * Override the state of a thread with the callers UTCB content
-	 *
-	 * \param thread_id  ID of the targeted thread
-	 *
-	 * Restricted to core threads. One can also write to its own context, or
-	 * to that of a thread that is active in the meantime.
-	 */
-	inline void write_thread_state(unsigned const thread_id) {
-		syscall(WRITE_THREAD_STATE, (Syscall_arg)thread_id); }
-
-
-	/**
-	 * Create a kernel object that acts as receiver for asynchronous signals
-	 *
-	 * \param dst  physical base of an appropriate portion of memory
-	 *             that is thereupon allocated to the kernel
-	 *
-	 * \return  ID of the new kernel object
-	 *
-	 * Restricted to core threads. Regaining of the supplied memory is not
-	 * supported by now.
-	 */
-	inline unsigned new_signal_receiver(void * dst) {
-		return syscall(NEW_SIGNAL_RECEIVER, (Syscall_arg)dst); }
-
-
-	/**
-	 * Create a kernel object that acts as a distinct signal type at a receiver
-	 *
-	 * \param dst          physical base of an appropriate portion of memory
-	 *                     that is thereupon allocated to the kernel
-	 * \param receiver_id  ID of the receiver kernel-object that shall
-	 *                     provide the new signal context
-	 * \param imprint      Every signal, one receives at the new context,
-	 *                     will hold this imprint. This enables the receiver
-	 *                     to interrelate signals with the context.
-	 *
-	 * \return  ID of the new kernel object
-	 *
-	 * Core-only syscall. Regaining of the supplied memory is not
-	 * supported by now.
-	 */
-	inline unsigned new_signal_context(void * dst, unsigned receiver_id,
-	                                   unsigned imprint)
-	{
-		return syscall(NEW_SIGNAL_CONTEXT, (Syscall_arg)dst,
-		               (Syscall_arg)receiver_id, (Syscall_arg)imprint);
-	}
-
-
-	/**
-	 * Wait for occurence of at least one signal at any context of a receiver
-	 *
-	 * \param receiver_id  ID of the targeted receiver kernel-object
-	 *
-	 * When this call returns, an instance of 'Signal::Data' is located at the
-	 * base of the callers UTCB. It's granted that every occurence of a signal
-	 * is provided through this function, exactly till it gets delivered through
-	 * this function. If multiple threads listen at the same receiver, and/or
-	 * multiple contexts of the receiver trigger simultanously, there is no
-	 * assertion about wich thread receives, and from wich context. But
-	 * deliveries belonging to the same context are serialized through
-	 * 'ack_signal', to enable synchronization in 'kill_signal'.
-	 */
-	inline void await_signal(unsigned receiver_id) {
-		syscall(AWAIT_SIGNAL, (Syscall_arg)receiver_id); }
-
-
-	/**
-	 * Get summarized state of all contexts of a signal receiver
-	 *
-	 * \param receiver_id  ID of the targeted receiver kernel-object
-	 */
-	inline bool signal_pending(unsigned receiver_id) {
-		return syscall(SIGNAL_PENDING, (Syscall_arg)receiver_id); }
-
-
-	/**
-	 * Trigger a specific signal context
-	 *
-	 * \param context_id  ID of the targeted context kernel-object
-	 * \param num         how often the context shall be triggered by this call
-	 */
-	inline void submit_signal(unsigned context_id, int num) {
-		syscall(SUBMIT_SIGNAL, (Syscall_arg)context_id, (Syscall_arg)num); }
-
-	/**
-	 * Acknowledge the processing of the last signal of a signal context
-	 *
-	 * \param context_id  kernel name of the targeted signal context
-	 *
-	 * Should be called after all signal objects, that reference the targeted
-	 * signal context in userland are destructed. The signal context wont
-	 * deliver a new signal until the old signal is acknowledged.
-	 */
-	inline void ack_signal(unsigned context_id) {
-		syscall(ACK_SIGNAL, (Syscall_arg)context_id); }
-
-	/**
-	 * Destruct a signal context
-	 *
-	 * \param context_id  kernel name of the targeted signal context
-	 *
-	 * \return  wether the context could be destructed
-	 *
-	 * Blocks the caller until the last delivered signal of the targeted
-	 * context is acknowledged. Then the context gets destructed, losing
-	 * all submits that were not delivered when this syscall occured.
-	 */
-	inline bool kill_signal_context(unsigned context_id) {
-		return syscall(KILL_SIGNAL_CONTEXT, (Syscall_arg)context_id); }
-
-	/**
-	 * Create a new virtual-machine that is stopped initially
-	 *
-	 * \param dst         physical base of an appropriate portion of memory
-	 *                    that is thereupon allocated to the kernel
-	 * \param state       location of the CPU state of the VM
-	 * \param context_id  ID of the targeted signal context
-	 *
-	 * \retval >0  ID of the new VM
-	 * \retval  0  if no new VM was created
-	 *
-	 * Restricted to core threads. Regaining of the supplied memory is not
-	 * supported by now.
-	 */
-	inline int new_vm(void * const dst, void * const state,
-	                  unsigned context_id)
-	{
-		return syscall(NEW_VM, (Syscall_arg)dst, (Syscall_arg)state,
-		               (Syscall_arg)context_id);
-	}
-
-
-	/**
-	 * Execute a virtual-machine (again)
-	 *
-	 * \param id  ID of the targeted VM
-	 *
-	 * Restricted to core threads.
-	 */
-	inline void run_vm(unsigned const id) {
-		syscall(RUN_VM, (Syscall_arg)id); }
-
-
-	/**
-	 * Stop execution of a virtual-machine
-	 *
-	 * \param id  ID of the targeted VM
-	 *
-	 * Restricted to core threads.
-	 */
-	inline void pause_vm(unsigned const id) {
-		syscall(PAUSE_VM, (Syscall_arg)id); }
-}
-
-#endif /* _INCLUDE__KERNEL__SYSCALLS_H_ */
-

base-hw/include/platform/imx53/drivers/trustzone.h

@@ -0,0 +1,33 @@
+/*
+ * \brief  TrustZone specific definitions for the i.MX53 board
+ * \author Stefan Kalkowski
+ * \date   2013-11-15
+ */
+
+/*
+ * Copyright (C) 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.
+ */
+
+#ifndef _INCLUDE__PLATFORM__IMX53__DRIVERS__TRUSTZONE_H_
+#define _INCLUDE__PLATFORM__IMX53__DRIVERS__TRUSTZONE_H_
+
+/* Genode includes */
+#include <drivers/board_base.h>
+
+namespace Trustzone
+{
+	enum {
+		VM_STATE_SIZE      = 1 << 20,
+		SECURE_RAM_BASE    = Genode::Board_base::RAM0_BASE,
+		SECURE_RAM_SIZE    = Genode::Board_base::RAM0_SIZE - VM_STATE_SIZE,
+		VM_STATE_BASE      = SECURE_RAM_BASE + SECURE_RAM_SIZE,
+		NONSECURE_RAM_BASE = Genode::Board_base::RAM1_BASE,
+		NONSECURE_RAM_SIZE = Genode::Board_base::RAM1_SIZE,
+	};
+}
+
+#endif /* _INCLUDE__PLATFORM__IMX53__DRIVERS__TRUSTZONE_H_ */
+

base-hw/include/platform/vea9x4/drivers/trustzone.h

@@ -0,0 +1,33 @@
+/*
+ * \brief  TrustZone specific definitions for the Versatile Express board
+ * \author Stefan Kalkowski
+ * \date   2013-11-15
+ */
+
+/*
+ * Copyright (C) 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.
+ */
+
+#ifndef _INCLUDE__PLATFORM__VEA9X4__DRIVERS__TRUSTZONE_H_
+#define _INCLUDE__PLATFORM__VEA9X4__DRIVERS__TRUSTZONE_H_
+
+/* Genode includes */
+#include <drivers/board_base.h>
+
+namespace Trustzone
+{
+	enum {
+		VM_STATE_SIZE      = 1 << 20,
+		SECURE_RAM_BASE    = Genode::Board_base::RAM_3_BASE,
+		SECURE_RAM_SIZE    = Genode::Board_base::RAM_3_SIZE - VM_STATE_SIZE,
+		VM_STATE_BASE      = SECURE_RAM_BASE + SECURE_RAM_SIZE,
+		NONSECURE_RAM_BASE = 0x80000000,
+		NONSECURE_RAM_SIZE = 0x20000000,
+	};
+}
+
+#endif /* _INCLUDE__PLATFORM__VEA9X4__DRIVERS__TRUSTZONE_H_ */
+

base-hw/include/signal_session/client.h

@@ -46,6 +46,9 @@ namespace Genode
 		              unsigned const imprint) {
 			return call<Rpc_alloc_context>(r, imprint); }
 
+		void free_receiver(Signal_receiver_capability cap) {
+			call<Rpc_free_receiver>(cap); }
+
 		void free_context(Signal_context_capability cap) {
 			call<Rpc_free_context>(cap); }
 	};

base-hw/include/signal_session/connection.h

@@ -1,33 +0,0 @@
-/*
- * \brief  base-hw specific (higher ram-quota) connection to signal service
- * \author Norman Feske
- * \author Stefan Kalkowski
- * \date   2009-08-05
- */
-
-/*
- * 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.
- */
-
-#ifndef _INCLUDE__SIGNAL_SESSION__CONNECTION_H_
-#define _INCLUDE__SIGNAL_SESSION__CONNECTION_H_
-
-#include <signal_session/client.h>
-#include <base/connection.h>
-
-namespace Genode {
-
-	struct Signal_connection : Connection<Signal_session>, Signal_session_client
-	{
-		Signal_connection()
-		:
-			Connection<Signal_session>(session("ram_quota=16K")),
-			Signal_session_client(cap())
-		{ }
-	};
-}
-
-#endif /* _INCLUDE__CAP_SESSION__CONNECTION_H_ */

base-hw/include/signal_session/signal_session.h

@@ -41,7 +41,11 @@ namespace Genode
 	 */
 	struct Signal_session : Session
 	{
-		class Out_of_metadata : public Exception { };
+		class Out_of_metadata        : public Exception { };
+		class Create_receiver_failed : public Exception { };
+		class Create_context_failed  : public Exception { };
+		class Kill_receiver_failed   : public Exception { };
+		class Kill_context_failed    : public Exception { };
 
 		/**
 		 * String that can be used to refer to this service
@@ -50,20 +54,24 @@ namespace Genode
 
 		/**
 		 * Destructor
+		 *
+		 * \throw Kill_context_failed
+		 * \throw Kill_receiver_failed
 		 */
 		virtual ~Signal_session() { }
 
 		/**
-		 * Create a new signal-receiver kernel-object
+		 * Create and manage a new signal receiver
 		 *
 		 * \return  a cap that acts as reference to the created object
 		 *
 		 * \throw Out_of_metadata
+		 * \throw Create_receiver_failed
 		 */
 		virtual Signal_receiver_capability alloc_receiver() = 0;
 
 		/**
-		 * Create a new signal-context kernel-object
+		 * Create and manage a new signal context
 		 *
 		 * \param r        names the signal receiver that shall provide
 		 *                 the new context
@@ -73,32 +81,54 @@ namespace Genode
 		 * \return  a cap that acts as reference to the created object
 		 *
 		 * \throw Out_of_metadata
+		 * \throw Create_context_failed
 		 */
 		virtual Signal_context_capability
-		alloc_context(Signal_receiver_capability const r,
+		alloc_context(Signal_receiver_capability r,
 		              unsigned const imprint) = 0;
 
 		/**
-		 * Free signal-context
+		 * Free a signal receiver
 		 *
-		 * \param cap  capability of signal-context to release
+		 * \param cap  capability of targeted signal receiver
+		 *
+		 * \throw Kill_receiver_failed
+		 */
+		virtual void free_receiver(Signal_receiver_capability cap) = 0;
+
+		/**
+		 * Free a signal context
+		 *
+		 * \param cap  capability of targeted signal context
+		 *
+		 * \throw Kill_context_failed
 		 */
 		virtual void free_context(Signal_context_capability cap) = 0;
 
+
 		/*********************
 		 ** RPC declaration **
 		 *********************/
 
 		GENODE_RPC_THROW(Rpc_alloc_receiver, Signal_receiver_capability,
-		                 alloc_receiver, GENODE_TYPE_LIST(Out_of_metadata));
+		                 alloc_receiver, GENODE_TYPE_LIST(Out_of_metadata,
+		                 Create_receiver_failed));
+
 		GENODE_RPC_THROW(Rpc_alloc_context, Signal_context_capability,
-		                 alloc_context, GENODE_TYPE_LIST(Out_of_metadata),
-		                 Signal_receiver_capability, unsigned);
-		GENODE_RPC(Rpc_free_context, void, free_context,
-		           Signal_context_capability);
+		                 alloc_context, GENODE_TYPE_LIST(Out_of_metadata,
+		                 Create_context_failed), Signal_receiver_capability,
+		                 unsigned);
+
+		GENODE_RPC_THROW(Rpc_free_receiver, void, free_receiver,
+		                 GENODE_TYPE_LIST(Kill_receiver_failed),
+		                 Signal_receiver_capability);
+
+		GENODE_RPC_THROW(Rpc_free_context, void, free_context,
+		                 GENODE_TYPE_LIST(Kill_context_failed),
+		                 Signal_context_capability);
 
 		GENODE_RPC_INTERFACE(Rpc_alloc_receiver, Rpc_alloc_context,
-		                     Rpc_free_context);
+		                     Rpc_free_receiver, Rpc_free_context);
 	};
 }
 

base-hw/lib/mk/arm/kernel_interface.mk

@@ -0,0 +1,2 @@
+SRC_CC = kernel/interface.cc
+vpath % $(REP_DIR)/src/arm

base-hw/lib/mk/arm/startup.mk

@@ -1,10 +0,0 @@
-#
-# \brief  Linked against any program expect LDSO and dynamic binaries
-# \author Martin Stein
-# \date   2012-04-16
-#
-
-include $(BASE_DIR)/lib/mk/startup.inc
-
-vpath crt0.s $(REP_DIR)/src/platform/arm
-

base-hw/lib/mk/arm/syscall.mk

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

base-hw/lib/mk/arm_v6/enable_perf_counter.mk

@@ -0,0 +1,3 @@
+SRC_CC = perf_counter.cc
+
+vpath %.cc $(REP_DIR)/src/core/arm_v6

base-hw/lib/mk/arm_v7/enable_perf_counter.mk

@@ -0,0 +1,3 @@
+SRC_CC = perf_counter.cc
+
+vpath %.cc $(REP_DIR)/src/core/arm_v7

base-hw/lib/mk/base-common.mk

@@ -4,8 +4,9 @@
 # \date   2013-02-14
 #
 
-LIBS += cxx syscall
+LIBS += cxx kernel_interface
 
+SRC_CC += main_bootstrap.cc
 SRC_CC += ipc.cc ipc/ipc_marshal_cap.cc
 SRC_CC += avl_tree/avl_tree.cc
 SRC_CC += allocator/slab.cc
@@ -18,9 +19,12 @@ SRC_CC += console/console.cc
 SRC_CC += lock/lock.cc
 SRC_CC += signal/signal.cc signal/common.cc
 SRC_CC += server/server.cc server/common.cc
-SRC_CC += thread/thread_bootstrap.cc
+SRC_CC += thread/thread_bootstrap.cc thread/trace.cc
 
-INC_DIR += $(REP_DIR)/src/base/lock $(BASE_DIR)/src/base/lock
+INC_DIR +=  $(REP_DIR)/src/base/lock
+INC_DIR += $(BASE_DIR)/src/base/lock
+INC_DIR += $(BASE_DIR)/src/base/thread
 
-vpath %.cc  $(REP_DIR)/src/base
-vpath %.cc $(BASE_DIR)/src/base
+vpath main_bootstrap.cc  $(REP_DIR)/src/platform
+vpath %.cc               $(REP_DIR)/src/base
+vpath %.cc              $(BASE_DIR)/src/base

base-hw/lib/mk/perf_counter.mk

@@ -0,0 +1,3 @@
+SRC_CC = perf_counter.cc
+
+vpath %.cc $(REP_DIR)/src/core/

base-hw/lib/mk/perf_counter/perf_counter.mk

@@ -0,0 +1 @@
+LIBS += enable_perf_counter

base-hw/mk/spec-hw_imx53.mk

@@ -8,7 +8,7 @@
 SPECS += hw platform_imx53 epit
 
 # set address where to link the text segment at
-LD_TEXT_ADDR ?= 0x70001000
+LD_TEXT_ADDR ?= 0x70010000
 
 # include implied specs
 include $(call select_from_repositories,mk/spec-hw.mk)

base-hw/mk/spec-hw_rpi.mk

@@ -8,7 +8,7 @@
 SPECS += hw platform_rpi
 
 # set address where to link the text segment at
-LD_TEXT_ADDR ?= 0x400000
+LD_TEXT_ADDR ?= 0x800000
 
 # include implied specs
 include $(call select_from_repositories,mk/spec-hw.mk)

base-hw/run/env

@@ -172,29 +172,7 @@ proc build_boot_image {binaries} {
 	exec cp -L bin/core $elf_img
 	exec [cross_dev_prefix]strip $elf_img
 
-	# target specific ops
-	if {[regexp "uboot" $run_target]} {
-
-		# parse ELF entrypoint and load address
-		set entrypoint [exec [cross_dev_prefix]readelf -h $elf_img | \
-		                grep "Entry point address: " | \
-		                sed -e "s/.*Entry point address: *//"]
-		set load_addr [exec [cross_dev_prefix]readelf -l $elf_img | \
-		               grep -m 1 "LOAD"]
-		set load_addr [lindex [regexp -inline -all -- {\S+} $load_addr] 3]
-
-		# compress ELF
-		set bin_img "[run_dir]/image.bin"
-		exec [cross_dev_prefix]objcopy -O binary $elf_img $bin_img
-		exec gzip --best --force $bin_img
-
-		# create compressed uImage
-		set uboot_img [run_dir]/uImage
-		exec mkimage -A arm -O linux -T kernel -C gzip -a $load_addr \
-		             -e $entrypoint -d $bin_img.gz $uboot_img
-		exec rm -rf $bin_img.gz
-
-	}
+	build_uboot_image $elf_img
 
 	# set symbolic link to image.elf file in TFTP directory for PXE boot
 	if {[info exists ::env(PXE_TFTP_DIR_BASE)] &&
@@ -207,7 +185,8 @@ proc build_boot_image {binaries} {
 	}
 
 	# retrieve stand-alone core
-	exec mv core/core.standalone bin/core
+	exec cp core/core.standalone bin/core
+	exec rm core/core.standalone
 }
 
 
@@ -228,7 +207,7 @@ proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id
 		return
 	}
 	if {[is_serial_available]} {
-		spawn_serial $wait_for_re $timeout_value
+		spawn_serial $wait_for_re $timeout_value "create local services"
 		return
 	}
 

base-hw/src/arm/kernel/interface.cc

@@ -0,0 +1,180 @@
+/*
+ * \brief  Interface between kernel and userland
+ * \author Martin stein
+ * \date   2011-11-30
+ */
+
+/*
+ * Copyright (C) 2011-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.
+ */
+
+/* Genode includes */
+#include <kernel/interface.h>
+
+using namespace Kernel;
+
+
+/**********************************************************************
+ ** Inline assembly templates for kernel calls with 1 to 6 arguments **
+ **********************************************************************/
+
+#define CALL_6_ASM_OPS \
+	"mov r5, #0       \n" \
+	"add r5, %[arg_5] \n" \
+	CALL_5_ASM_OPS
+
+#define CALL_5_ASM_OPS \
+	"mov r4, #0       \n" \
+	"add r4, %[arg_4] \n" \
+	CALL_4_ASM_OPS
+
+#define CALL_4_ASM_OPS \
+	"mov r3, #0       \n" \
+	"add r3, %[arg_3] \n" \
+	CALL_3_ASM_OPS
+
+#define CALL_3_ASM_OPS \
+	"mov r2, #0       \n" \
+	"add r2, %[arg_2] \n" \
+	CALL_2_ASM_OPS
+
+#define CALL_2_ASM_OPS \
+	"mov r1, #0       \n" \
+	"add r1, %[arg_1] \n" \
+	CALL_1_ASM_OPS
+
+#define CALL_1_ASM_OPS  \
+	"mov r0, #0        \n" \
+	"add r0, %[arg_0]  \n" \
+	"swi 0             \n" \
+	"mov %[result], #0 \n" \
+	"add %[result], r0   "
+
+
+/****************************************************************************
+ ** Inline assembly "writeable" tpl-args for kernel calls with 1 to 6 args **
+ ****************************************************************************/
+
+#define CALL_6_ASM_WRITE [arg_5] "+r" (arg_5), CALL_5_ASM_WRITE
+#define CALL_5_ASM_WRITE [arg_4] "+r" (arg_4), CALL_4_ASM_WRITE
+#define CALL_4_ASM_WRITE [arg_3] "+r" (arg_3), CALL_3_ASM_WRITE
+#define CALL_3_ASM_WRITE [arg_2] "+r" (arg_2), CALL_2_ASM_WRITE
+#define CALL_2_ASM_WRITE [arg_1] "+r" (arg_1), CALL_1_ASM_WRITE
+#define CALL_1_ASM_WRITE \
+	[arg_0]  "+r" (arg_0),  \
+	[result] "+r" (result)
+
+
+/**************************************************************************
+ ** Inline assembly clobber lists for kernel calls with 1 to 6 arguments **
+ **************************************************************************/
+
+#define CALL_6_ASM_CLOBBER "r5", CALL_5_ASM_CLOBBER
+#define CALL_5_ASM_CLOBBER "r4", CALL_4_ASM_CLOBBER
+#define CALL_4_ASM_CLOBBER "r3", CALL_3_ASM_CLOBBER
+#define CALL_3_ASM_CLOBBER "r2", CALL_2_ASM_CLOBBER
+#define CALL_2_ASM_CLOBBER "r1", CALL_1_ASM_CLOBBER
+#define CALL_1_ASM_CLOBBER "r0"
+
+
+/************************************
+ ** Calls with 1 to 6 arguments **
+ ************************************/
+
+Call_ret Kernel::call(Call_arg arg_0)
+{
+	Call_ret result = 0;
+	asm volatile(CALL_1_ASM_OPS
+	           : CALL_1_ASM_WRITE
+	          :: CALL_1_ASM_CLOBBER);
+	return result;
+}
+
+
+Call_ret Kernel::call(Call_arg arg_0,
+                      Call_arg arg_1)
+{
+	Call_ret result = 0;
+	asm volatile(CALL_2_ASM_OPS
+	           : CALL_2_ASM_WRITE
+	          :: CALL_2_ASM_CLOBBER);
+	return result;
+}
+
+
+Call_ret Kernel::call(Call_arg arg_0,
+                      Call_arg arg_1,
+                      Call_arg arg_2)
+{
+	Call_ret result = 0;
+	asm volatile(CALL_3_ASM_OPS
+	           : CALL_3_ASM_WRITE
+	          :: CALL_3_ASM_CLOBBER);
+	return result;
+}
+
+
+Call_ret Kernel::call(Call_arg arg_0,
+                      Call_arg arg_1,
+                      Call_arg arg_2,
+                      Call_arg arg_3)
+{
+	Call_ret result = 0;
+	asm volatile(CALL_4_ASM_OPS
+	           : CALL_4_ASM_WRITE
+	          :: CALL_4_ASM_CLOBBER);
+	return result;
+}
+
+
+Call_ret Kernel::call(Call_arg arg_0,
+                      Call_arg arg_1,
+                      Call_arg arg_2,
+                      Call_arg arg_3,
+                      Call_arg arg_4)
+{
+	Call_ret result = 0;
+	asm volatile(CALL_5_ASM_OPS
+	           : CALL_5_ASM_WRITE
+	          :: CALL_5_ASM_CLOBBER);
+	return result;
+}
+
+
+Call_ret Kernel::call(Call_arg arg_0,
+                      Call_arg arg_1,
+                      Call_arg arg_2,
+                      Call_arg arg_3,
+                      Call_arg arg_4,
+                      Call_arg arg_5)
+{
+	Call_ret result = 0;
+	asm volatile(CALL_6_ASM_OPS
+	           : CALL_6_ASM_WRITE
+	          :: CALL_6_ASM_CLOBBER);
+	return result;
+}
+
+
+/*************************
+ ** CPU-state utilities **
+ *************************/
+
+typedef Thread_reg_id Reg_id;
+
+static addr_t const _cpu_state_regs[] = {
+	Reg_id::R0,   Reg_id::R1,   Reg_id::R2,  Reg_id::R3, Reg_id::R4,
+	Reg_id::R5,   Reg_id::R6,   Reg_id::R7,  Reg_id::R8, Reg_id::R9,
+	Reg_id::R10,  Reg_id::R11,  Reg_id::R12, Reg_id::SP, Reg_id::LR,
+	Reg_id::IP,   Reg_id::CPSR, Reg_id::CPU_EXCEPTION };
+
+addr_t const * cpu_state_regs() { return _cpu_state_regs; }
+
+
+size_t cpu_state_regs_length()
+{
+	return sizeof(_cpu_state_regs)/sizeof(_cpu_state_regs[0]);
+}

base-hw/src/base/arm/syscall.cc

@@ -1,163 +0,0 @@
-/*
- * \brief  Syscall-framework implementation for ARM
- * \author Martin stein
- * \date   2011-11-30
- *
- * The code in this file is compliant to the general ARM instruction- and
- * register-set but the semantics are tested only on ARMv6 and ARMv7 by now.
- */
-
-/*
- * Copyright (C) 2011-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.
- */
-
-/* Genode includes */
-#include <kernel/syscalls.h>
-
-using namespace Kernel;
-
-
-/******************************************************************
- ** Inline assembly templates for syscalls with 1 to 6 arguments **
- ******************************************************************/
-
-#define SYSCALL_6_ASM_OPS \
-	"mov r5, #0       \n" \
-	"add r5, %[arg_5] \n" \
-	SYSCALL_5_ASM_OPS
-
-#define SYSCALL_5_ASM_OPS \
-	"mov r4, #0       \n" \
-	"add r4, %[arg_4] \n" \
-	SYSCALL_4_ASM_OPS
-
-#define SYSCALL_4_ASM_OPS \
-	"mov r3, #0       \n" \
-	"add r3, %[arg_3] \n" \
-	SYSCALL_3_ASM_OPS
-
-#define SYSCALL_3_ASM_OPS \
-	"mov r2, #0       \n" \
-	"add r2, %[arg_2] \n" \
-	SYSCALL_2_ASM_OPS
-
-#define SYSCALL_2_ASM_OPS \
-	"mov r1, #0       \n" \
-	"add r1, %[arg_1] \n" \
-	SYSCALL_1_ASM_OPS
-
-#define SYSCALL_1_ASM_OPS  \
-	"mov r0, #0        \n" \
-	"add r0, %[arg_0]  \n" \
-	"swi 0             \n" \
-	"mov %[result], #0 \n" \
-	"add %[result], r0   "
-
-
-/*****************************************************************************
- ** Inline assembly "writeable" template-args for syscalls with 1 to 6 args **
- *****************************************************************************/
-
-#define SYSCALL_6_ASM_WRITE [arg_5] "+r" (arg_5), SYSCALL_5_ASM_WRITE
-#define SYSCALL_5_ASM_WRITE [arg_4] "+r" (arg_4), SYSCALL_4_ASM_WRITE
-#define SYSCALL_4_ASM_WRITE [arg_3] "+r" (arg_3), SYSCALL_3_ASM_WRITE
-#define SYSCALL_3_ASM_WRITE [arg_2] "+r" (arg_2), SYSCALL_2_ASM_WRITE
-#define SYSCALL_2_ASM_WRITE [arg_1] "+r" (arg_1), SYSCALL_1_ASM_WRITE
-#define SYSCALL_1_ASM_WRITE \
-	[arg_0]  "+r" (arg_0),  \
-	[result] "+r" (result)
-
-
-/**********************************************************************
- ** Inline assembly clobber lists for syscalls with 1 to 6 arguments **
- **********************************************************************/
-
-#define SYSCALL_6_ASM_CLOBBER "r5", SYSCALL_5_ASM_CLOBBER
-#define SYSCALL_5_ASM_CLOBBER "r4", SYSCALL_4_ASM_CLOBBER
-#define SYSCALL_4_ASM_CLOBBER "r3", SYSCALL_3_ASM_CLOBBER
-#define SYSCALL_3_ASM_CLOBBER "r2", SYSCALL_2_ASM_CLOBBER
-#define SYSCALL_2_ASM_CLOBBER "r1", SYSCALL_1_ASM_CLOBBER
-#define SYSCALL_1_ASM_CLOBBER "r0"
-
-
-/************************************
- ** Syscalls with 1 to 6 arguments **
- ************************************/
-
-Syscall_ret Kernel::syscall(Syscall_arg arg_0)
-{
-	Syscall_ret result = 0;
-	asm volatile(SYSCALL_1_ASM_OPS
-	           : SYSCALL_1_ASM_WRITE
-	          :: SYSCALL_1_ASM_CLOBBER);
-	return result;
-}
-
-
-Syscall_ret Kernel::syscall(Syscall_arg arg_0,
-                            Syscall_arg arg_1)
-{
-	Syscall_ret result = 0;
-	asm volatile(SYSCALL_2_ASM_OPS
-	           : SYSCALL_2_ASM_WRITE
-	          :: SYSCALL_2_ASM_CLOBBER);
-	return result;
-}
-
-
-Syscall_ret Kernel::syscall(Syscall_arg arg_0,
-                            Syscall_arg arg_1,
-                            Syscall_arg arg_2)
-{
-	Syscall_ret result = 0;
-	asm volatile(SYSCALL_3_ASM_OPS
-	           : SYSCALL_3_ASM_WRITE
-	          :: SYSCALL_3_ASM_CLOBBER);
-	return result;
-}
-
-
-Syscall_ret Kernel::syscall(Syscall_arg arg_0,
-                            Syscall_arg arg_1,
-                            Syscall_arg arg_2,
-                            Syscall_arg arg_3)
-{
-	Syscall_ret result = 0;
-	asm volatile(SYSCALL_4_ASM_OPS
-	           : SYSCALL_4_ASM_WRITE
-	          :: SYSCALL_4_ASM_CLOBBER);
-	return result;
-}
-
-
-Syscall_ret Kernel::syscall(Syscall_arg arg_0,
-                            Syscall_arg arg_1,
-                            Syscall_arg arg_2,
-                            Syscall_arg arg_3,
-                            Syscall_arg arg_4)
-{
-	Syscall_ret result = 0;
-	asm volatile(SYSCALL_5_ASM_OPS
-	           : SYSCALL_5_ASM_WRITE
-	          :: SYSCALL_5_ASM_CLOBBER);
-	return result;
-}
-
-
-Syscall_ret Kernel::syscall(Syscall_arg arg_0,
-                            Syscall_arg arg_1,
-                            Syscall_arg arg_2,
-                            Syscall_arg arg_3,
-                            Syscall_arg arg_4,
-                            Syscall_arg arg_5)
-{
-	Syscall_ret result = 0;
-	asm volatile(SYSCALL_6_ASM_OPS
-	           : SYSCALL_6_ASM_WRITE
-	          :: SYSCALL_6_ASM_CLOBBER);
-	return result;
-}
-

base-hw/src/base/arm_v7a/syscall.cc

@@ -1,160 +0,0 @@
-/*
- * \brief  Syscall-framework implementation for ARM V7A systems
- * \author Martin stein
- * \date   2011-11-30
- */
-
-/*
- * Copyright (C) 2011-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.
- */
-
-/* Genode includes */
-#include <base/syscall.h>
-
-using namespace Kernel;
-
-
-/******************************************************************
- ** Inline assembly templates for syscalls with 1 to 6 arguments **
- ******************************************************************/
-
-#define SYSCALL_6_ASM_OPS \
-	"mov r5, #0       \n" \
-	"add r5, %[arg_5] \n" \
-	SYSCALL_5_ASM_OPS
-
-#define SYSCALL_5_ASM_OPS \
-	"mov r4, #0       \n" \
-	"add r4, %[arg_4] \n" \
-	SYSCALL_4_ASM_OPS
-
-#define SYSCALL_4_ASM_OPS \
-	"mov r3, #0       \n" \
-	"add r3, %[arg_3] \n" \
-	SYSCALL_3_ASM_OPS
-
-#define SYSCALL_3_ASM_OPS \
-	"mov r2, #0       \n" \
-	"add r2, %[arg_2] \n" \
-	SYSCALL_2_ASM_OPS
-
-#define SYSCALL_2_ASM_OPS \
-	"mov r1, #0       \n" \
-	"add r1, %[arg_1] \n" \
-	SYSCALL_1_ASM_OPS
-
-#define SYSCALL_1_ASM_OPS  \
-	"mov r0, #0        \n" \
-	"add r0, %[arg_0]  \n" \
-	"svc 0x0           \n" \
-	"mov %[result], #0 \n" \
-	"add %[result], r0   "
-
-
-/*****************************************************************************
- ** Inline assembly "writeable" template-args for syscalls with 1 to 6 args **
- *****************************************************************************/
-
-#define SYSCALL_6_ASM_WRITE [arg_5] "+r" (arg_5), SYSCALL_5_ASM_WRITE
-#define SYSCALL_5_ASM_WRITE [arg_4] "+r" (arg_4), SYSCALL_4_ASM_WRITE
-#define SYSCALL_4_ASM_WRITE [arg_3] "+r" (arg_3), SYSCALL_3_ASM_WRITE
-#define SYSCALL_3_ASM_WRITE [arg_2] "+r" (arg_2), SYSCALL_2_ASM_WRITE
-#define SYSCALL_2_ASM_WRITE [arg_1] "+r" (arg_1), SYSCALL_1_ASM_WRITE
-#define SYSCALL_1_ASM_WRITE \
-	[arg_0]  "+r" (arg_0),  \
-	[result] "+r" (result)
-
-
-/**********************************************************************
- ** Inline assembly clobber lists for syscalls with 1 to 6 arguments **
- **********************************************************************/
-
-#define SYSCALL_6_ASM_CLOBBER "r5", SYSCALL_5_ASM_CLOBBER
-#define SYSCALL_5_ASM_CLOBBER "r4", SYSCALL_4_ASM_CLOBBER
-#define SYSCALL_4_ASM_CLOBBER "r3", SYSCALL_3_ASM_CLOBBER
-#define SYSCALL_3_ASM_CLOBBER "r2", SYSCALL_2_ASM_CLOBBER
-#define SYSCALL_2_ASM_CLOBBER "r1", SYSCALL_1_ASM_CLOBBER
-#define SYSCALL_1_ASM_CLOBBER "r0"
-
-
-/************************************
- ** Syscalls with 1 to 6 arguments **
- ************************************/
-
-Syscall_ret Kernel::syscall(Syscall_arg arg_0)
-{
-	Syscall_ret result = 0;
-	asm volatile(SYSCALL_1_ASM_OPS
-	           : SYSCALL_1_ASM_WRITE
-	          :: SYSCALL_1_ASM_CLOBBER);
-	return result;
-}
-
-
-Syscall_ret Kernel::syscall(Syscall_arg arg_0,
-                            Syscall_arg arg_1)
-{
-	Syscall_ret result = 0;
-	asm volatile(SYSCALL_2_ASM_OPS
-	           : SYSCALL_2_ASM_WRITE
-	          :: SYSCALL_2_ASM_CLOBBER);
-	return result;
-}
-
-
-Syscall_ret Kernel::syscall(Syscall_arg arg_0,
-                            Syscall_arg arg_1,
-                            Syscall_arg arg_2)
-{
-	Syscall_ret result = 0;
-	asm volatile(SYSCALL_3_ASM_OPS
-	           : SYSCALL_3_ASM_WRITE
-	          :: SYSCALL_3_ASM_CLOBBER);
-	return result;
-}
-
-
-Syscall_ret Kernel::syscall(Syscall_arg arg_0,
-                            Syscall_arg arg_1,
-                            Syscall_arg arg_2,
-                            Syscall_arg arg_3)
-{
-	Syscall_ret result = 0;
-	asm volatile(SYSCALL_4_ASM_OPS
-	           : SYSCALL_4_ASM_WRITE
-	          :: SYSCALL_4_ASM_CLOBBER);
-	return result;
-}
-
-
-Syscall_ret Kernel::syscall(Syscall_arg arg_0,
-                            Syscall_arg arg_1,
-                            Syscall_arg arg_2,
-                            Syscall_arg arg_3,
-                            Syscall_arg arg_4)
-{
-	Syscall_ret result = 0;
-	asm volatile(SYSCALL_5_ASM_OPS
-	           : SYSCALL_5_ASM_WRITE
-	          :: SYSCALL_5_ASM_CLOBBER);
-	return result;
-}
-
-
-Syscall_ret Kernel::syscall(Syscall_arg arg_0,
-                            Syscall_arg arg_1,
-                            Syscall_arg arg_2,
-                            Syscall_arg arg_3,
-                            Syscall_arg arg_4,
-                            Syscall_arg arg_5)
-{
-	Syscall_ret result = 0;
-	asm volatile(SYSCALL_6_ASM_OPS
-	           : SYSCALL_6_ASM_WRITE
-	          :: SYSCALL_6_ASM_CLOBBER);
-	return result;
-}
-

base-hw/src/base/ipc.cc

@@ -14,7 +14,9 @@
 /* Genode includes */
 #include <base/ipc.h>
 #include <base/thread.h>
-#include <kernel/syscalls.h>
+
+/* base-hw includes */
+#include <kernel/interface.h>
 #include <kernel/log.h>
 
 using namespace Genode;
@@ -38,40 +40,38 @@ enum
  ***************/
 
 /**
- * Limit message size to the size of UTCB and message buffer
+ * Copy message from the callers UTCB to message buffer
  */
-void limit_msg_size(Msgbuf_base * const msgbuf, Native_utcb * const utcb,
-                    size_t & size)
-{
-	if (size > utcb->size() || size > msgbuf->size()) {
-		kernel_log() << __PRETTY_FUNCTION__ << ": truncate message\n";
-		size = utcb->size() < msgbuf->size() ? utcb->size() : msgbuf->size();
-	}
-}
-
-
-/**
- * Copy message payload to message buffer
- */
-static void utcb_to_msgbuf(Msgbuf_base * const msgbuf, size_t size)
+static void utcb_to_msgbuf(Msgbuf_base * const msgbuf)
 {
 	Native_utcb * const utcb = Thread_base::myself()->utcb();
-	limit_msg_size(msgbuf, utcb, size);
-	memcpy(msgbuf->buf, utcb->base(), size);
+	size_t msg_size = utcb->ipc_msg.size;
+	if (msg_size > msgbuf->size()) {
+		kernel_log() << "oversized IPC message\n";
+		msg_size = msgbuf->size();
+	}
+	memcpy(msgbuf->buf, utcb->ipc_msg.data, msg_size);
 }
 
 
 /**
- * Copy message payload to the UTCB
+ * Copy message from message buffer to the callers UTCB
  */
-static void msgbuf_to_utcb(Msgbuf_base * const msgbuf, size_t size,
+static void msgbuf_to_utcb(Msgbuf_base * const msg_buf, size_t msg_size,
                            unsigned const local_name)
 {
 	Native_utcb * const utcb = Thread_base::myself()->utcb();
-	*(unsigned *)utcb->base() = local_name;
-	size += sizeof(local_name);
-	limit_msg_size(msgbuf, utcb, size);
-	memcpy((unsigned *)utcb->base() + 1, (unsigned *)msgbuf->buf + 1, size);
+	enum { NAME_SIZE = sizeof(local_name) };
+	size_t const ipc_msg_size = msg_size + NAME_SIZE;
+	if (ipc_msg_size > utcb->ipc_msg_max_size()) {
+		kernel_log() << "oversized IPC message\n";
+		msg_size = utcb->ipc_msg_max_size() - NAME_SIZE;
+	}
+	*(unsigned *)utcb->ipc_msg.data = local_name;
+	void * const utcb_msg = (void *)((addr_t)utcb->ipc_msg.data + NAME_SIZE);
+	void * const buf_msg  = (void *)((addr_t)msg_buf->buf + NAME_SIZE);
+	memcpy(utcb_msg, buf_msg, msg_size);
+	utcb->ipc_msg.size = ipc_msg_size;
 }
 
 
@@ -94,8 +94,8 @@ Ipc_ostream::Ipc_ostream(Native_capability dst, Msgbuf_base *snd_msg)
 
 void Ipc_istream::_wait()
 {
-	/* FIXME this shall be not supported */
-	Kernel::pause_thread();
+	/* FIXME: this shall be not supported */
+	Kernel::pause_thread(0);
 }
 
 
@@ -118,18 +118,26 @@ void Ipc_client::_call()
 {
 	using namespace Kernel;
 
-	/* send request and receive reply */
-	msgbuf_to_utcb(_snd_msg, _write_offset, Ipc_ostream::_dst.local_name());
-	size_t const s = request_and_wait(Ipc_ostream::_dst.dst(), _write_offset);
-	utcb_to_msgbuf(_rcv_msg, s);
+	/* send request */
+	unsigned const local_name = Ipc_ostream::_dst.local_name();
+	msgbuf_to_utcb(_snd_msg, _write_offset, local_name);
+	request_and_wait(Ipc_ostream::_dst.dst());
+
+	/* receive reply */
+	Native_utcb * const utcb = Thread_base::myself()->utcb();
+	if (utcb->msg.type != Msg::Type::IPC) {
+		PERR("failed to receive reply");
+		throw Blocking_canceled();
+	}
+	utcb_to_msgbuf(_rcv_msg);
 
 	/* reset unmarshaller */
 	_write_offset = _read_offset = RPC_OBJECT_ID_SIZE;
 }
 
 
-Ipc_client::Ipc_client(Native_capability const &srv,
-                       Msgbuf_base *snd_msg, Msgbuf_base *rcv_msg)
+Ipc_client::Ipc_client(Native_capability const &srv, Msgbuf_base *snd_msg,
+                       Msgbuf_base *rcv_msg, unsigned short)
 : Ipc_istream(rcv_msg), Ipc_ostream(srv, snd_msg), _result(0) { }
 
 
@@ -161,27 +169,46 @@ void Ipc_server::_prepare_next_reply_wait()
 void Ipc_server::_wait()
 {
 	/* receive next request */
-	utcb_to_msgbuf(_rcv_msg, Kernel::wait_for_request());
+	Kernel::wait_for_request();
+	Native_utcb * const utcb = Thread_base::myself()->utcb();
+	if (utcb->msg.type != Msg::Type::IPC) {
+		PERR("failed to receive request");
+		throw Blocking_canceled();
+	}
+	utcb_to_msgbuf(_rcv_msg);
 
 	/* update server state */
 	_prepare_next_reply_wait();
 }
 
 
-void Ipc_server::_reply() { Kernel::reply(_write_offset, 0); }
+void Ipc_server::_reply()
+{
+	Native_utcb * const utcb = Thread_base::myself()->utcb();
+	utcb->ipc_msg.size = _write_offset;
+	Kernel::reply(0);
+}
 
 
 void Ipc_server::_reply_wait()
 {
-	/* if there is no reply simply do wait for request */
-	/* FIXME this shall be not supported */
+	/* if there is no reply, wait for request */
 	if (!_reply_needed) {
 		_wait();
 		return;
 	}
-	/* send reply and receive next request */
-	msgbuf_to_utcb(_snd_msg, _write_offset, Ipc_ostream::_dst.local_name());
-	utcb_to_msgbuf(_rcv_msg, Kernel::reply(_write_offset, 1));
+	/* send reply an await request */
+	unsigned const local_name = Ipc_ostream::_dst.local_name();
+	msgbuf_to_utcb(_snd_msg, _write_offset, local_name);
+	Kernel::reply(1);
+
+	/* fetch request */
+	Native_utcb * const utcb = Thread_base::myself()->utcb();
+	if (utcb->msg.type != Msg::Type::IPC) {
+		PERR("failed to receive request");
+		throw Blocking_canceled();
+	}
+	utcb_to_msgbuf(_rcv_msg);
 
 	/* update server state */
 	_prepare_next_reply_wait();