ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-09 12:02:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base: remove pager code from public API

Browse Source 
Fix #1593
This commit is contained in:
Stefan Kalkowski 2015-06-19 14:58:18 +02:00 committed by Christian Helmuth
parent 01f22d4dc6
commit 2a351215f4
81 changed files with 313 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
repos/base-codezero/include/base/ipc_pager.h → repos/base-codezero/src/core/include/ipc_pager.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _INCLUDE__BASE__IPC_PAGER_H_ #ifndef _CORE__INCLUDE__IPC_PAGER_H_
#define _INCLUDE__BASE__IPC_PAGER_H_ #define _CORE__INCLUDE__IPC_PAGER_H_
#include <base/cache.h> #include <base/cache.h>
#include <base/ipc.h> #include <base/ipc.h>
@ -168,4 +168,4 @@ namespace Genode {
}; };
} }
#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */ #endif /* _CORE__INCLUDE__IPC_PAGER_H_ */

2
repos/base-codezero/src/core/include/platform_thread.h
View File

@ -15,11 +15,11 @@
#define _CORE__INCLUDE__PLATFORM_THREAD_H_ #define _CORE__INCLUDE__PLATFORM_THREAD_H_
/* Genode includes */ /* Genode includes */
#include <base/pager.h>
#include <base/thread_state.h> #include <base/thread_state.h>
#include <base/native_types.h> #include <base/native_types.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <address_space.h> #include <address_space.h>
namespace Genode { namespace Genode {

2
repos/base-codezero/src/base/ipc/pager.cc → repos/base-codezero/src/core/ipc_pager.cc
View File

@ -12,10 +12,10 @@
*/ */
/* Genode includes */ /* Genode includes */
#include <base/ipc_pager.h>
#include <base/printf.h> #include <base/printf.h>
/* Codezero includes */ /* Codezero includes */
#include <ipc_pager.h>
#include <codezero/syscalls.h> #include <codezero/syscalls.h>

4
repos/base-codezero/src/base/pager/pager.cc → repos/base-codezero/src/core/pager.cc
View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
/* Genode includes */ /* Core includes */
#include <base/pager.h> #include <pager.h>
using namespace Genode; using namespace Genode;

37
repos/base-codezero/src/core/target.inc
View File

@ -2,33 +2,35 @@ TARGET = core
GEN_CORE_DIR = $(BASE_DIR)/src/core GEN_CORE_DIR = $(BASE_DIR)/src/core
SRC_CC += \ SRC_CC += cap_session_component.cc \
main.cc \ context_area.cc \
ram_session_component.cc \ core_mem_alloc.cc \
ram_session_support.cc \ core_rm_session.cc \
rom_session_component.cc \
cap_session_component.cc \
cpu_session_component.cc \ cpu_session_component.cc \
cpu_session_support.cc \ cpu_session_support.cc \
pd_session_component.cc \ dataspace_component.cc \
dump_alloc.cc \
io_mem_session_component.cc \ io_mem_session_component.cc \
io_mem_session_support.cc \ io_mem_session_support.cc \
thread_start.cc \ ipc_pager.cc \
platform_thread.cc \ irq_session_component.cc \
main.cc \
pager.cc \
pager_common.cc \
pd_session_component.cc \
platform.cc \
platform_pd.cc \ platform_pd.cc \
platform_services.cc \ platform_services.cc \
platform.cc \ platform_thread.cc \
dataspace_component.cc \ ram_session_component.cc \
ram_session_support.cc \
rm_session_component.cc \ rm_session_component.cc \
rm_session_support.cc \ rm_session_support.cc \
irq_session_component.cc \ rom_session_component.cc \
signal_session_component.cc \ signal_session_component.cc \
signal_source_component.cc \ signal_source_component.cc \
trace_session_component.cc \ thread_start.cc \
core_rm_session.cc \ trace_session_component.cc
core_mem_alloc.cc \
dump_alloc.cc \
context_area.cc
LIBS += core_printf base-common LIBS += core_printf base-common
@ -56,4 +58,5 @@ vpath dataspace_component.cc $(GEN_CORE_DIR)
vpath core_mem_alloc.cc $(GEN_CORE_DIR) vpath core_mem_alloc.cc $(GEN_CORE_DIR)
vpath dump_alloc.cc $(GEN_CORE_DIR) vpath dump_alloc.cc $(GEN_CORE_DIR)
vpath context_area.cc $(GEN_CORE_DIR) vpath context_area.cc $(GEN_CORE_DIR)
vpath pager_common.cc $(GEN_CORE_DIR)
vpath %.cc $(REP_DIR)/src/core vpath %.cc $(REP_DIR)/src/core

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

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

6
repos/base-fiasco/include/base/ipc_pager.h → repos/base-fiasco/src/core/include/ipc_pager.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _INCLUDE__BASE__IPC_PAGER_H_ #ifndef _CORE__INCLUDE__IPC_PAGER_H_
#define _INCLUDE__BASE__IPC_PAGER_H_ #define _CORE__INCLUDE__IPC_PAGER_H_
/* Genode includes */ /* Genode includes */
#include <base/cache.h> #include <base/cache.h>
@ -172,4 +172,4 @@ namespace Genode {
}; };
} }
#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */ #endif /* _CORE__INCLUDE__IPC_PAGER_H_ */

2
repos/base-fiasco/src/core/include/platform_thread.h
View File

@ -17,9 +17,9 @@
/* Genode includes */ /* Genode includes */
#include <base/native_types.h> #include <base/native_types.h>
#include <base/thread_state.h> #include <base/thread_state.h>
#include <base/pager.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <platform_pd.h> #include <platform_pd.h>
#include <address_space.h> #include <address_space.h>

5
repos/base-fiasco/src/base/ipc/pager.cc → repos/base-fiasco/src/core/ipc_pager.cc
View File

@ -11,9 +11,12 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#include <base/ipc_pager.h> /* Genode includes */
#include <base/printf.h> #include <base/printf.h>
/* Core includes */
#include <ipc_pager.h>
namespace Fiasco { namespace Fiasco {
#include <l4/sys/ipc.h> #include <l4/sys/ipc.h>
#include <l4/sys/syscalls.h> #include <l4/sys/syscalls.h>

3
repos/base-fiasco/src/base/pager/pager.cc → repos/base-fiasco/src/core/pager.cc
View File

@ -14,7 +14,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#include <base/pager.h> /* Core includes */
#include <pager.h>
namespace Fiasco { namespace Fiasco {
#include <l4/sys/ipc.h> #include <l4/sys/ipc.h>

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

@ -2,33 +2,36 @@ TARGET = core
GEN_CORE_DIR = $(BASE_DIR)/src/core GEN_CORE_DIR = $(BASE_DIR)/src/core
SRC_CC += main.cc \ SRC_CC += cap_session_component.cc \
multiboot_info.cc \ context_area.cc \
ram_session_component.cc \ core_printf.cc \
ram_session_support.cc \
rom_session_component.cc \
cap_session_component.cc \
cpu_session_component.cc \ cpu_session_component.cc \
cpu_session_support.cc \ cpu_session_support.cc \
pd_session_component.cc \ dataspace_component.cc \
dump_alloc.cc \
io_mem_session_component.cc \ io_mem_session_component.cc \
io_mem_session_support.cc \ io_mem_session_support.cc \
thread_start.cc \ io_port_session_component.cc \
platform_thread.cc \ ipc_pager.cc \
irq_session_component.cc \
main.cc \
multiboot_info.cc \
pager.cc \
pager_common.cc \
pd_session_component.cc \
platform.cc \
platform_pd.cc \ platform_pd.cc \
platform_services.cc \ platform_services.cc \
platform.cc \ platform_thread.cc \
dataspace_component.cc \ ram_session_component.cc \
ram_session_support.cc \
rm_session_component.cc \ rm_session_component.cc \
rm_session_support.cc \ rm_session_support.cc \
io_port_session_component.cc \ rom_session_component.cc \
irq_session_component.cc \
signal_session_component.cc \ signal_session_component.cc \
signal_source_component.cc \ signal_source_component.cc \
trace_session_component.cc \ thread_start.cc \
dump_alloc.cc \ trace_session_component.cc
context_area.cc \
core_printf.cc
INC_DIR += $(REP_DIR)/src/core/include \ INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \ $(GEN_CORE_DIR)/include \
@ -55,5 +58,6 @@ vpath trace_session_component.cc $(GEN_CORE_DIR)
vpath dataspace_component.cc $(GEN_CORE_DIR) vpath dataspace_component.cc $(GEN_CORE_DIR)
vpath dump_alloc.cc $(GEN_CORE_DIR) vpath dump_alloc.cc $(GEN_CORE_DIR)
vpath context_area.cc $(GEN_CORE_DIR) vpath context_area.cc $(GEN_CORE_DIR)
vpath pager_common.cc $(GEN_CORE_DIR)
vpath core_printf.cc $(BASE_DIR)/src/base/console vpath core_printf.cc $(BASE_DIR)/src/base/console
vpath %.cc $(REP_DIR)/src/core vpath %.cc $(REP_DIR)/src/core

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

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

3
repos/base-foc/lib/mk/base-common.inc → repos/base-foc/lib/mk/base-common.mk
View File

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

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

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

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

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

29
repos/base-foc/src/base/ipc/arm/pager_exception.cc
View File

@ -1,29 +0,0 @@
/*
* \brief ARM-specific pager support for Fiasco.OC
* \author Stefan Kalkowski
* \date 2011-08-24
*/
/*
* 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.
*/
#include <base/ipc_pager.h>
namespace Fiasco {
#include <l4/sys/utcb.h>
}
enum Exceptions { EX_REGS = 0x500000 };
void Genode::Ipc_pager::_parse_exception()
{
if (Fiasco::l4_utcb_exc()->err == EX_REGS)
_type = PAUSE;
else
_type = EXCEPTION;
}

19
repos/base-foc/src/base/ipc/arm/pager.cc → repos/base-foc/src/core/arm/ipc_pager.cc
View File

@ -13,8 +13,23 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
/* Genode includes */ /* core includes */
#include <base/ipc_pager.h> #include <ipc_pager.h>
namespace Fiasco {
#include <l4/sys/utcb.h>
}
enum Exceptions { EX_REGS = 0x500000 };
void Genode::Ipc_pager::_parse_exception()
{
if (Fiasco::l4_utcb_exc()->err == EX_REGS)
_type = PAUSE;
else
_type = EXCEPTION;
}
void Genode::Ipc_pager::get_regs(Thread_state *state) void Genode::Ipc_pager::get_regs(Thread_state *state)

7
repos/base-foc/src/core/arm/target.inc Normal file
View File

@ -0,0 +1,7 @@
REQUIRES += arm
SRC_CC += arm/platform_arm.cc \
arm/ipc_pager.cc
include $(REP_DIR)/src/core/target.inc
vpath platform_services.cc $(GEN_CORE_DIR)

8
repos/base-foc/src/core/arndale/target.mk
View File

@ -1,8 +1,4 @@
include $(PRG_DIR)/../target.inc
LD_TEXT_ADDR = 0x80100000 LD_TEXT_ADDR = 0x80100000
REQUIRES += foc_arndale
REQUIRES += arm foc_arndale include $(REP_DIR)/src/core/arm/target.inc
SRC_CC += arm/platform_arm.cc
vpath platform_services.cc $(GEN_CORE_DIR)

9
repos/base-foc/src/core/imx53/target.mk
View File

@ -1,9 +1,4 @@
include $(PRG_DIR)/../target.inc
REQUIRES += arm foc_imx53
SRC_CC += arm/platform_arm.cc
LD_TEXT_ADDR = 0x70140000 LD_TEXT_ADDR = 0x70140000
REQUIRES += foc_imx53
vpath platform_services.cc $(GEN_CORE_DIR) include $(REP_DIR)/src/core/arm/target.inc

2
repos/base-foc/src/core/include/cpu_session_component.h
View File

@ -21,11 +21,11 @@
#include <base/allocator_guard.h> #include <base/allocator_guard.h>
#include <base/tslab.h> #include <base/tslab.h>
#include <base/lock.h> #include <base/lock.h>
#include <base/pager.h>
#include <base/rpc_server.h> #include <base/rpc_server.h>
#include <foc_cpu_session/foc_cpu_session.h> #include <foc_cpu_session/foc_cpu_session.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <platform_thread.h> #include <platform_thread.h>
#include <trace/control_area.h> #include <trace/control_area.h>
#include <trace/source_registry.h> #include <trace/source_registry.h>

6
repos/base-foc/include/base/ipc_pager.h → repos/base-foc/src/core/include/ipc_pager.h
View File

@ -12,8 +12,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _INCLUDE__BASE__IPC_PAGER_H_ #ifndef _CORE__INCLUDE__IPC_PAGER_H_
#define _INCLUDE__BASE__IPC_PAGER_H_ #define _CORE__INCLUDE__IPC_PAGER_H_
/* Genode includes */ /* Genode includes */
#include <base/cache.h> #include <base/cache.h>
@ -198,4 +198,4 @@ namespace Genode {
}; };
} }
#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */ #endif /* _CORE__INCLUDE__IPC_PAGER_H_ */

2
repos/base-foc/src/core/include/platform.h
View File

@ -19,9 +19,9 @@
/* Genode includes */ /* Genode includes */
#include <base/sync_allocator.h> #include <base/sync_allocator.h>
#include <base/allocator_avl.h> #include <base/allocator_avl.h>
#include <base/pager.h>
/* Core includes */ /* Core includes */
#include <pager.h>
#include <cap_id_alloc.h> #include <cap_id_alloc.h>
#include <platform_generic.h> #include <platform_generic.h>
#include <platform_thread.h> #include <platform_thread.h>

2
repos/base-foc/src/core/include/platform_thread.h
View File

@ -18,9 +18,9 @@
/* Genode includes */ /* Genode includes */
#include <base/native_types.h> #include <base/native_types.h>
#include <base/thread_state.h> #include <base/thread_state.h>
#include <base/pager.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <platform_pd.h> #include <platform_pd.h>
#include <cap_session_component.h> #include <cap_session_component.h>
#include <cap_mapping.h> #include <cap_mapping.h>

5
repos/base-foc/src/base/ipc/pager.cc → repos/base-foc/src/core/ipc_pager.cc
View File

@ -11,10 +11,13 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#include <base/ipc_pager.h> /* Genode includes */
#include <base/printf.h> #include <base/printf.h>
#include <base/thread.h> #include <base/thread.h>
/* Core includes */
#include <ipc_pager.h>
namespace Fiasco { namespace Fiasco {
#include <l4/sys/ipc.h> #include <l4/sys/ipc.h>
} }

4
repos/base-foc/src/base/pager/pager.cc → repos/base-foc/src/core/pager.cc
View File

@ -16,11 +16,13 @@
*/ */
/* Genode includes */ /* Genode includes */
#include <base/pager.h>
#include <base/env.h> #include <base/env.h>
#include <base/printf.h> #include <base/printf.h>
#include <base/lock.h> #include <base/lock.h>
/* Core includes */
#include <pager.h>
/* Fiasco.OC includes */ /* Fiasco.OC includes */
namespace Fiasco { namespace Fiasco {
#include <l4/sys/factory.h> #include <l4/sys/factory.h>

8
repos/base-foc/src/core/panda/target.mk
View File

@ -1,8 +1,4 @@
include $(PRG_DIR)/../target.inc
LD_TEXT_ADDR = 0x80140000 LD_TEXT_ADDR = 0x80140000
REQUIRES += foc_panda
REQUIRES += arm foc_panda include $(REP_DIR)/src/core/arm/target.inc
SRC_CC += arm/platform_arm.cc
vpath platform_services.cc $(GEN_CORE_DIR)

9
repos/base-foc/src/core/pbxa9/target.mk
View File

@ -1,9 +1,4 @@
include $(PRG_DIR)/../target.inc
REQUIRES += arm foc_pbxa9
SRC_CC += arm/platform_arm.cc
LD_TEXT_ADDR = 0x70490000 LD_TEXT_ADDR = 0x70490000
REQUIRES += foc_pbxa9
vpath platform_services.cc $(GEN_CORE_DIR) include $(REP_DIR)/src/core/arm/target.inc

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

@ -1,23 +1,25 @@
TARGET = core TARGET = core
REQUIRES = foc REQUIRES += foc
LD_TEXT_ADDR = 0x500000
GEN_CORE_DIR = $(BASE_DIR)/src/core GEN_CORE_DIR = $(BASE_DIR)/src/core
LIBS += base-common LIBS += base-common
SRC_CC = cap_session_component.cc \ SRC_CC += cap_session_component.cc \
context_area.cc \ context_area.cc \
core_printf.cc \
cpu_session_component.cc \ cpu_session_component.cc \
cpu_session_extension.cc \ cpu_session_extension.cc \
dataspace_component.cc \ dataspace_component.cc \
dump_alloc.cc \ dump_alloc.cc \
io_mem_session_component.cc \ io_mem_session_component.cc \
io_mem_session_support.cc \ io_mem_session_support.cc \
ipc_pager.cc \
irq_session_component.cc \ irq_session_component.cc \
main.cc \ main.cc \
multiboot_info.cc \ multiboot_info.cc \
pager.cc \
pager_common.cc \
pd_session_component.cc \ pd_session_component.cc \
pd_session_extension.cc \ pd_session_extension.cc \
platform.cc \ platform.cc \
@ -31,9 +33,8 @@ SRC_CC = cap_session_component.cc \
rom_session_component.cc \ rom_session_component.cc \
signal_session_component.cc \ signal_session_component.cc \
signal_source_component.cc \ signal_source_component.cc \
trace_session_component.cc \
thread_start.cc \ thread_start.cc \
core_printf.cc trace_session_component.cc
INC_DIR += $(REP_DIR)/src/core/include \ INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \ $(GEN_CORE_DIR)/include \
@ -58,6 +59,7 @@ vpath rm_session_component.cc $(GEN_CORE_DIR)
vpath rom_session_component.cc $(GEN_CORE_DIR) vpath rom_session_component.cc $(GEN_CORE_DIR)
vpath signal_session_component.cc $(GEN_CORE_DIR) vpath signal_session_component.cc $(GEN_CORE_DIR)
vpath trace_session_component.cc $(GEN_CORE_DIR) vpath trace_session_component.cc $(GEN_CORE_DIR)
vpath pager_common.cc $(GEN_CORE_DIR)
vpath core_printf.cc $(BASE_DIR)/src/base/console vpath core_printf.cc $(BASE_DIR)/src/base/console
vpath %.cc $(REP_DIR)/src/core vpath %.cc $(REP_DIR)/src/core
vpath %.cc $(REP_DIR)/src/base/thread vpath %.cc $(REP_DIR)/src/base/thread

9
repos/base-foc/src/core/vea9x4/target.mk
View File

@ -1,9 +1,4 @@
include $(PRG_DIR)/../target.inc
REQUIRES += arm foc_vea9x4
SRC_CC += arm/platform_arm.cc
LD_TEXT_ADDR = 0x60490000 LD_TEXT_ADDR = 0x60490000
REQUIRES += foc_vea9x4
vpath platform_services.cc $(GEN_CORE_DIR) include $(REP_DIR)/src/core/arm/target.inc

3
repos/base-foc/src/base/ipc/x86/pager_exception.cc → repos/base-foc/src/core/x86/ipc_pager.cc
View File

@ -11,7 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#include <base/ipc_pager.h> /* core includes */
#include <ipc_pager.h>
namespace Fiasco { namespace Fiasco {
#include <l4/sys/utcb.h> #include <l4/sys/utcb.h>

0
repos/base-foc/src/core/x86/platform_x86.cc → repos/base-foc/src/core/x86/platform.cc
View File

10
repos/base-foc/src/core/x86/target.inc Normal file
View File

@ -0,0 +1,10 @@
LD_TEXT_ADDR = 0x500000
REQUIRES += x86
SRC_CC += io_port_session_component.cc \
x86/ipc_pager.cc \
x86/platform.cc
vpath io_port_session_component.cc $(BASE_DIR)/src/core/x86
vpath platform_services.cc $(BASE_DIR)/src/core/x86
include $(REP_DIR)/src/core/target.inc

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

@ -1,9 +0,0 @@
include $(PRG_DIR)/../target.inc
REQUIRES += x86
SRC_CC += io_port_session_component.cc \
x86/platform_x86.cc
vpath io_port_session_component.cc $(GEN_CORE_DIR)/x86
vpath platform_services.cc $(GEN_CORE_DIR)/x86

4
repos/base-foc/src/base/ipc/x86_32/pager.cc → repos/base-foc/src/core/x86_32/ipc_pager.cc
View File

@ -13,8 +13,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
/* Genode includes */ /* core includes */
#include <base/ipc_pager.h> #include <ipc_pager.h>
void Genode::Ipc_pager::get_regs(Genode::Thread_state *state) void Genode::Ipc_pager::get_regs(Genode::Thread_state *state)

4
repos/base-foc/src/core/x86_32/target.mk Normal file
View File

@ -0,0 +1,4 @@
REQUIRES += foc_x86_32
SRC_CC += x86_32/ipc_pager.cc
include $(REP_DIR)/src/core/x86/target.inc

4
repos/base-foc/src/base/ipc/x86_64/pager.cc → repos/base-foc/src/core/x86_64/ipc_pager.cc
View File

@ -13,8 +13,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
/* Genode includes */ /* core includes */
#include <base/ipc_pager.h> #include <ipc_pager.h>
void Genode::Ipc_pager::get_regs(Thread_state *state) void Genode::Ipc_pager::get_regs(Thread_state *state)

4
repos/base-foc/src/core/x86_64/target.mk Normal file
View File

@ -0,0 +1,4 @@
REQUIRES += foc_x86_64
SRC_CC += x86_64/ipc_pager.cc
include $(REP_DIR)/src/core/x86/target.inc

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

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _BASE__PAGER_H_ #ifndef _CORE__INCLUDE__PAGER_H_
#define _BASE__PAGER_H_ #define _CORE__INCLUDE__PAGER_H_
/* Genode includes */ /* Genode includes */
#include <base/thread.h> #include <base/thread.h>
@ -351,4 +351,4 @@ class Genode::Pager_activation : public Pager_activation_base
} }
}; };
#endif /* _BASE__PAGER_H_ */ #endif /* _CORE__INCLUDE__PAGER_H_ */

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

@ -12,10 +12,10 @@
*/ */
/* Genode includes */ /* Genode includes */
#include <base/pager.h>
#include <base/printf.h> #include <base/printf.h>
/* core includes*/ /* core includes*/
#include <pager.h>
#include <platform_thread.h> #include <platform_thread.h>
#include <platform_pd.h> #include <platform_pd.h>

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

@ -12,10 +12,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
/* Genode includes */
#include <base/pager.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <rm_session_component.h> #include <rm_session_component.h>
#include <platform.h> #include <platform.h>
#include <platform_pd.h> #include <platform_pd.h>

2
repos/base-linux/src/core/include/cpu_session_component.h
View File

@ -19,11 +19,11 @@
#include <util/list.h> #include <util/list.h>
#include <base/allocator_guard.h> #include <base/allocator_guard.h>
#include <base/lock.h> #include <base/lock.h>
#include <base/pager.h>
#include <base/rpc_server.h> #include <base/rpc_server.h>
#include <linux_cpu_session/linux_cpu_session.h> #include <linux_cpu_session/linux_cpu_session.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <cpu_thread_allocator.h> #include <cpu_thread_allocator.h>
#include <platform_thread.h> #include <platform_thread.h>
#include <trace/control_area.h> #include <trace/control_area.h>

6
repos/base-linux/include/base/pager.h → repos/base-linux/src/core/include/pager.h
View File

@ -14,8 +14,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _INCLUDE__BASE__PAGER_H_ #ifndef _CORE__INCLUDE__PAGER_H_
#define _INCLUDE__BASE__PAGER_H_ #define _CORE__INCLUDE__PAGER_H_
#include <base/signal.h> #include <base/signal.h>
#include <pager/capability.h> #include <pager/capability.h>
@ -55,4 +55,4 @@ namespace Genode {
template <int FOO> class Pager_activation : public Pager_activation_base { }; template <int FOO> class Pager_activation : public Pager_activation_base { };
} }
#endif /* _INCLUDE__BASE__PAGER_H_ */ #endif /* _CORE__INCLUDE__PAGER_H_ */

5
repos/base-linux/src/core/include/platform_thread.h
View File

@ -16,10 +16,13 @@
#ifndef _CORE__INCLUDE__LINUX__PLATFORM_THREAD_H_ #ifndef _CORE__INCLUDE__LINUX__PLATFORM_THREAD_H_
#define _CORE__INCLUDE__LINUX__PLATFORM_THREAD_H_ #define _CORE__INCLUDE__LINUX__PLATFORM_THREAD_H_
#include <base/pager.h> /* Genode includes */
#include <base/thread_state.h> #include <base/thread_state.h>
#include <cpu_session/cpu_session.h> #include <cpu_session/cpu_session.h>
/* Core includes */
#include <pager.h>
namespace Genode { namespace Genode {
class Platform_thread; class Platform_thread;

6
repos/base-linux/src/core/include/rm_session_component.h
View File

@ -16,12 +16,14 @@
#ifndef _CORE__INCLUDE__LINUX__RM_SESSION_COMPONENT_H_ #ifndef _CORE__INCLUDE__LINUX__RM_SESSION_COMPONENT_H_
#define _CORE__INCLUDE__LINUX__RM_SESSION_COMPONENT_H_ #define _CORE__INCLUDE__LINUX__RM_SESSION_COMPONENT_H_
/* Genode */ /* Genode includes */
#include <base/pager.h>
#include <base/allocator.h> #include <base/allocator.h>
#include <base/rpc_server.h> #include <base/rpc_server.h>
#include <rm_session/rm_session.h> #include <rm_session/rm_session.h>
/* Core includes */
#include <pager.h>
namespace Genode { namespace Genode {
struct Rm_client; struct Rm_client;

2
repos/base-nova/lib/mk/base-common.inc → repos/base-nova/lib/mk/base-common.mk
View File

@ -6,7 +6,7 @@
LIBS += cxx startup LIBS += cxx startup
SRC_CC += ipc/ipc.cc ipc/pager.cc SRC_CC += ipc/ipc.cc
SRC_CC += avl_tree/avl_tree.cc SRC_CC += avl_tree/avl_tree.cc
SRC_CC += allocator/slab.cc SRC_CC += allocator/slab.cc
SRC_CC += allocator/allocator_avl.cc SRC_CC += allocator/allocator_avl.cc

3
repos/base-nova/lib/mk/x86_32/base-common.mk
View File

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

5
repos/base-nova/lib/mk/x86_32/core.mk Normal file
View File

@ -0,0 +1,5 @@
SRC_CC += pager.cc
INC_DIR = $(REP_DIR)/src/core/include
vpath %.cc $(REP_DIR)/src/core/spec/x86_32

3
repos/base-nova/lib/mk/x86_64/base-common.mk
View File

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

5
repos/base-nova/lib/mk/x86_64/core.mk Normal file
View File

@ -0,0 +1,5 @@
SRC_CC += pager.cc
INC_DIR = $(REP_DIR)/src/core/include
vpath %.cc $(REP_DIR)/src/core/spec/x86_64

2
repos/base-nova/src/core/include/cpu_session_component.h
View File

@ -21,11 +21,11 @@
#include <base/allocator_guard.h> #include <base/allocator_guard.h>
#include <base/tslab.h> #include <base/tslab.h>
#include <base/lock.h> #include <base/lock.h>
#include <base/pager.h>
#include <base/rpc_server.h> #include <base/rpc_server.h>
#include <nova_cpu_session/nova_cpu_session.h> #include <nova_cpu_session/nova_cpu_session.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <platform_thread.h> #include <platform_thread.h>
#include <trace/control_area.h> #include <trace/control_area.h>
#include <trace/source_registry.h> #include <trace/source_registry.h>

6
repos/base-nova/include/base/ipc_pager.h → repos/base-nova/src/core/include/ipc_pager.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _INCLUDE__BASE__IPC_PAGER_H_ #ifndef _CORE__INCLUDE__IPC_PAGER_H_
#define _INCLUDE__BASE__IPC_PAGER_H_ #define _CORE__INCLUDE__IPC_PAGER_H_
/* Genode includes */ /* Genode includes */
#include <base/cache.h> #include <base/cache.h>
@ -138,4 +138,4 @@ namespace Genode {
}; };
} }
#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */ #endif /* _CORE__INCLUDE__IPC_PAGER_H_ */

12
repos/base-nova/include/base/pager.h → repos/base-nova/src/core/include/pager.h
View File

@ -11,16 +11,20 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _INCLUDE__BASE__PAGER_H_ #ifndef _CORE__INCLUDE__PAGER_H_
#define _INCLUDE__BASE__PAGER_H_ #define _CORE__INCLUDE__PAGER_H_
/* Genode includes */
#include <base/thread.h> #include <base/thread.h>
#include <base/object_pool.h> #include <base/object_pool.h>
#include <base/ipc_pager.h>
#include <base/capability.h> #include <base/capability.h>
#include <cap_session/cap_session.h> #include <cap_session/cap_session.h>
#include <pager/capability.h> #include <pager/capability.h>
/* Core includes */
#include <ipc_pager.h>
namespace Genode { namespace Genode {
class Pager_entrypoint; class Pager_entrypoint;
@ -401,4 +405,4 @@ namespace Genode {
}; };
} }
#endif /* _INCLUDE__BASE__PAGER_H_ */ #endif /* _CORE__INCLUDE__PAGER_H_ */

2
repos/base-nova/src/core/include/platform_thread.h
View File

@ -20,9 +20,9 @@
#include <base/thread_state.h> #include <base/thread_state.h>
#include <base/native_types.h> #include <base/native_types.h>
#include <base/thread.h> #include <base/thread.h>
#include <base/pager.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <address_space.h> #include <address_space.h>
namespace Genode { namespace Genode {

5
repos/base-nova/src/base/ipc/pager.cc → repos/base-nova/src/core/ipc_pager.cc
View File

@ -12,12 +12,15 @@
*/ */
/* Genode includes */ /* Genode includes */
#include <base/ipc_pager.h>
#include <base/thread.h> #include <base/thread.h>
/* Core includes */
#include <ipc_pager.h>
/* NOVA includes */ /* NOVA includes */
#include <nova/syscalls.h> #include <nova/syscalls.h>
enum { verbose_page_fault = false }; enum { verbose_page_fault = false };
using namespace Genode; using namespace Genode;

6
repos/base-nova/src/base/pager/pager.cc → repos/base-nova/src/core/pager.cc
View File

@ -14,13 +14,13 @@
*/ */
/* Genode includes */ /* Genode includes */
#include <base/pager.h>
#include <base/sleep.h> #include <base/sleep.h>
#include <util/construct_at.h> #include <util/construct_at.h>
#include <rm_session/rm_session.h> #include <rm_session/rm_session.h>
/* Core includes */
#include <pager.h>
/* NOVA includes */ /* NOVA includes */
#include <nova/syscalls.h> #include <nova/syscalls.h>
#include <nova_util.h> /* map_local */ #include <nova_util.h> /* map_local */

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

@ -15,9 +15,9 @@
/* Genode includes */ /* Genode includes */
#include <base/printf.h> #include <base/printf.h>
#include <base/ipc_pager.h>
/* core includes */ /* core includes */
#include <ipc_pager.h>
#include <platform_thread.h> #include <platform_thread.h>
#include <platform_pd.h> #include <platform_pd.h>
#include <util.h> #include <util.h>

4
repos/base-nova/src/base/pager/x86_32/pager.cc → repos/base-nova/src/core/spec/x86_32/pager.cc
View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
/* Genode includes */ /* Core includes */
#include <base/pager.h> #include <pager.h>
/* NOVA includes */ /* NOVA includes */
#include <nova/syscalls.h> #include <nova/syscalls.h>

4
repos/base-nova/src/base/pager/x86_64/pager.cc → repos/base-nova/src/core/spec/x86_64/pager.cc
View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
/* Genode includes */ /* Core includes */
#include <base/pager.h> #include <pager.h>
/* NOVA includes */ /* NOVA includes */
#include <nova/syscalls.h> #include <nova/syscalls.h>

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

@ -1,38 +1,39 @@
TARGET = core TARGET = core
LIBS = base-common LIBS = base-common core
GEN_CORE_DIR = $(BASE_DIR)/src/core GEN_CORE_DIR = $(BASE_DIR)/src/core
SRC_CC = main.cc \ SRC_CC = context_area.cc \
ram_session_component.cc \ core_mem_alloc.cc \
ram_session_support.cc \ core_printf.cc \
rom_session_component.cc \ core_rm_session.cc \
cpu_session_component.cc \ cpu_session_component.cc \
cpu_session_extension.cc \
cpu_session_support.cc \ cpu_session_support.cc \
pd_session_component.cc \ dataspace_component.cc \
dump_alloc.cc \
echo.cc \
io_mem_session_component.cc \ io_mem_session_component.cc \
io_mem_session_support.cc \ io_mem_session_support.cc \
thread_start.cc \ io_port_session_component.cc \
platform_thread.cc \ ipc_pager.cc \
platform_pd.cc \ irq_session_component.cc \
main.cc \
pager.cc \
pd_session_component.cc \
pd_session_extension.cc \
platform.cc \ platform.cc \
platform_pd.cc \
platform_services.cc \ platform_services.cc \
core_mem_alloc.cc \ platform_thread.cc \
dataspace_component.cc \ ram_session_component.cc \
ram_session_support.cc \
rm_session_component.cc \ rm_session_component.cc \
rm_session_support.cc \ rm_session_support.cc \
io_port_session_component.cc \ rom_session_component.cc \
irq_session_component.cc \
signal_session_component.cc \ signal_session_component.cc \
trace_session_component.cc \ thread_start.cc \
core_rm_session.cc \ trace_session_component.cc
context_area.cc \
echo.cc \
dump_alloc.cc \
cpu_session_extension.cc \
pd_session_extension.cc \
core_printf.cc \
pager.cc
INC_DIR = $(REP_DIR)/src/core/include \ INC_DIR = $(REP_DIR)/src/core/include \
$(REP_DIR)/src/base/console \ $(REP_DIR)/src/base/console \
@ -58,4 +59,3 @@ vpath platform_services.cc $(GEN_CORE_DIR)/x86
vpath context_area.cc $(GEN_CORE_DIR) vpath context_area.cc $(GEN_CORE_DIR)
vpath core_printf.cc $(BASE_DIR)/src/base/console vpath core_printf.cc $(BASE_DIR)/src/base/console
vpath %.cc $(REP_DIR)/src/core vpath %.cc $(REP_DIR)/src/core
vpath pager.cc $(REP_DIR)/src/base/pager

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

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

6
repos/base-okl4/include/base/ipc_pager.h → repos/base-okl4/src/core/include/ipc_pager.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _INCLUDE__BASE__IPC_PAGER_H_ #ifndef _CORE__INCLUDE__IPC_PAGER_H_
#define _INCLUDE__BASE__IPC_PAGER_H_ #define _CORE__INCLUDE__IPC_PAGER_H_
#include <base/cache.h> #include <base/cache.h>
#include <base/ipc.h> #include <base/ipc.h>
@ -185,4 +185,4 @@ namespace Genode {
}; };
} }
#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */ #endif /* _CORE__INCLUDE__IPC_PAGER_H_ */

2
repos/base-okl4/src/core/include/platform_thread.h
View File

@ -15,11 +15,11 @@
#define _CORE__INCLUDE__PLATFORM_THREAD_H_ #define _CORE__INCLUDE__PLATFORM_THREAD_H_
/* Genode includes */ /* Genode includes */
#include <base/pager.h>
#include <base/thread_state.h> #include <base/thread_state.h>
#include <base/native_types.h> #include <base/native_types.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <platform_pd.h> #include <platform_pd.h>
#include <address_space.h> #include <address_space.h>

5
repos/base-okl4/src/base/ipc/pager.cc → repos/base-okl4/src/core/ipc_pager.cc
View File

@ -11,9 +11,12 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#include <base/ipc_pager.h> /* Genode includes */
#include <base/printf.h> #include <base/printf.h>
/* Core includes */
#include <ipc_pager.h>
namespace Okl4 { extern "C" { namespace Okl4 { extern "C" {
#include <l4/message.h> #include <l4/message.h>
#include <l4/ipc.h> #include <l4/ipc.h>

3
repos/base-okl4/src/base/pager/pager.cc → repos/base-okl4/src/core/pager.cc
View File

@ -11,7 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#include <base/pager.h> /* Core includes */
#include <pager.h>
using namespace Genode; using namespace Genode;

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

@ -4,34 +4,37 @@ LIBS += boot_info base-common
GEN_CORE_DIR = $(BASE_DIR)/src/core GEN_CORE_DIR = $(BASE_DIR)/src/core
SRC_CC += main.cc \ SRC_CC += cap_session_component.cc \
ram_session_component.cc \ context_area.cc \
ram_session_support.cc \
rom_session_component.cc \
cap_session_component.cc \
cpu_session_component.cc \
cpu_session_support.cc \
pd_session_component.cc \
okl4_pd_session_component.cc \
io_mem_session_component.cc \
io_mem_session_support.cc \
thread_start.cc \
platform_thread.cc \
platform_pd.cc \
platform.cc \
platform_services.cc \
dataspace_component.cc \
rm_session_component.cc \
rm_session_support.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 \ core_mem_alloc.cc \
core_printf.cc \ core_printf.cc \
core_rm_session.cc \
cpu_session_component.cc \
cpu_session_support.cc \
dataspace_component.cc \
dump_alloc.cc \ dump_alloc.cc \
context_area.cc io_mem_session_component.cc \
io_mem_session_support.cc \
ipc_pager.cc \
irq_session_component.cc \
main.cc \
okl4_pd_session_component.cc \
pager.cc \
pager_common.cc \
pd_session_component.cc \
platform.cc \
platform_pd.cc \
platform_services.cc \
platform_thread.cc \
ram_session_component.cc \
ram_session_support.cc \
rm_session_component.cc \
rm_session_support.cc \
rom_session_component.cc \
signal_session_component.cc \
signal_source_component.cc \
thread_start.cc \
trace_session_component.cc
INC_DIR += $(REP_DIR)/src/core/include \ INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \ $(GEN_CORE_DIR)/include \
@ -58,6 +61,7 @@ vpath dataspace_component.cc $(GEN_CORE_DIR)
vpath core_mem_alloc.cc $(GEN_CORE_DIR) vpath core_mem_alloc.cc $(GEN_CORE_DIR)
vpath dump_alloc.cc $(GEN_CORE_DIR) vpath dump_alloc.cc $(GEN_CORE_DIR)
vpath context_area.cc $(GEN_CORE_DIR) vpath context_area.cc $(GEN_CORE_DIR)
vpath pager_common.cc $(GEN_CORE_DIR)
vpath %.cc $(REP_DIR)/src/core vpath %.cc $(REP_DIR)/src/core
vpath core_printf.cc $(BASE_DIR)/src/base/console vpath core_printf.cc $(BASE_DIR)/src/base/console

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

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

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

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _INCLUDE__BASE__IPC_PAGER_H_ #ifndef _CORE__INCLUDE__IPC_PAGER_H_
#define _INCLUDE__BASE__IPC_PAGER_H_ #define _CORE__INCLUDE__IPC_PAGER_H_
/* Genode includes */ /* Genode includes */
#include <base/cache.h> #include <base/cache.h>
@ -186,4 +186,4 @@ namespace Genode {
}; };
} }
#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */ #endif /* _CORE__INCLUDE__IPC_PAGER_H_ */

2
repos/base-pistachio/src/core/include/platform_thread.h
View File

@ -16,10 +16,10 @@
/* Genode includes */ /* Genode includes */
#include <base/native_types.h> #include <base/native_types.h>
#include <base/pager.h>
#include <base/thread_state.h> #include <base/thread_state.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <platform_pd.h> #include <platform_pd.h>
#include <address_space.h> #include <address_space.h>

5
repos/base-pistachio/src/base/ipc/pager.cc → repos/base-pistachio/src/core/ipc_pager.cc
View File

@ -11,10 +11,13 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#include <base/ipc_pager.h> /* Genode includes */
#include <base/printf.h> #include <base/printf.h>
#include <base/sleep.h> #include <base/sleep.h>
/* Core includes */
#include <ipc_pager.h>
namespace Pistachio namespace Pistachio
{ {
#include <l4/message.h> #include <l4/message.h>

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

@ -14,7 +14,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#include <base/pager.h> /* Core includes */
#include <pager.h>
using namespace Genode; using namespace Genode;

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

@ -4,33 +4,36 @@ LIBS = base-common
GEN_CORE_DIR = $(BASE_DIR)/src/core GEN_CORE_DIR = $(BASE_DIR)/src/core
SRC_CC = main.cc \ SRC_CC = cap_session_component.cc \
multiboot_info.cc \
ram_session_component.cc \
ram_session_support.cc \
rom_session_component.cc \
cap_session_component.cc \
cpu_session_component.cc \
cpu_session_platform.cc \
pd_session_component.cc \
io_mem_session_component.cc \
io_mem_session_support.cc \
thread_start.cc \
platform_thread.cc \
platform_pd.cc \
platform.cc \
platform_services.cc \
dataspace_component.cc \
rm_session_component.cc \
rm_session_support.cc \
irq_session_component.cc \
signal_session_component.cc \
signal_source_component.cc \
trace_session_component.cc \
dump_alloc.cc \
context_area.cc \ context_area.cc \
core_printf.cc \ core_printf.cc \
kip.cc cpu_session_component.cc \
cpu_session_platform.cc \
dataspace_component.cc \
dump_alloc.cc \
io_mem_session_component.cc \
io_mem_session_support.cc \
ipc_pager.cc \
irq_session_component.cc \
kip.cc \
main.cc \
multiboot_info.cc \
pd_session_component.cc \
pager.cc \
pager_common.cc \
platform.cc \
platform_pd.cc \
platform_services.cc \
platform_thread.cc \
ram_session_component.cc \
ram_session_support.cc \
rm_session_component.cc \
rm_session_support.cc \
rom_session_component.cc \
signal_session_component.cc \
signal_source_component.cc \
thread_start.cc \
trace_session_component.cc
INC_DIR += $(REP_DIR)/src/core/include \ INC_DIR += $(REP_DIR)/src/core/include \
$(REP_DIR)/src/base/console \ $(REP_DIR)/src/base/console \
@ -54,6 +57,7 @@ vpath trace_session_component.cc $(GEN_CORE_DIR)
vpath dataspace_component.cc $(GEN_CORE_DIR) vpath dataspace_component.cc $(GEN_CORE_DIR)
vpath dump_alloc.cc $(GEN_CORE_DIR) vpath dump_alloc.cc $(GEN_CORE_DIR)
vpath context_area.cc $(GEN_CORE_DIR) vpath context_area.cc $(GEN_CORE_DIR)
vpath pager_common.cc $(GEN_CORE_DIR)
vpath core_printf.cc $(BASE_DIR)/src/base/console vpath core_printf.cc $(BASE_DIR)/src/base/console
vpath kip.cc $(REP_DIR)/src/base/kip vpath kip.cc $(REP_DIR)/src/base/kip
vpath %.cc $(REP_DIR)/src/core vpath %.cc $(REP_DIR)/src/core

6
repos/base-sel4/src/core/include/install_mapping.h
View File

@ -14,9 +14,9 @@
#ifndef _CORE__INCLUDE__INSTALL_MAPPING_H_ #ifndef _CORE__INCLUDE__INSTALL_MAPPING_H_
#define _CORE__INCLUDE__INSTALL_MAPPING_H_ #define _CORE__INCLUDE__INSTALL_MAPPING_H_
/* Genode includes */ /* Core includes */
#include <base/ipc_pager.h> #include <ipc_pager.h>
#include <base/pager.h> #include <pager.h>
namespace Genode { namespace Genode {

6
repos/base-sel4/include/base/ipc_pager.h → repos/base-sel4/src/core/include/ipc_pager.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _INCLUDE__BASE__IPC_PAGER_H_ #ifndef _CORE__INCLUDE__IPC_PAGER_H_
#define _INCLUDE__BASE__IPC_PAGER_H_ #define _CORE__INCLUDE__IPC_PAGER_H_
#include <base/cache.h> #include <base/cache.h>
#include <base/ipc.h> #include <base/ipc.h>
@ -156,4 +156,4 @@ namespace Genode {
}; };
} }
#endif /* _INCLUDE__BASE__IPC_PAGER_H_ */ #endif /* _CORE__INCLUDE__IPC_PAGER_H_ */

4
repos/base-sel4/src/core/include/platform_thread.h
View File

@ -15,13 +15,13 @@
#define _CORE__INCLUDE__PLATFORM_THREAD_H_ #define _CORE__INCLUDE__PLATFORM_THREAD_H_
/* Genode includes */ /* Genode includes */
#include <base/pager.h>
#include <base/thread_state.h> #include <base/thread_state.h>
#include <base/native_types.h> #include <base/native_types.h>
#include <util/string.h> #include <util/string.h>
#include <base/ipc_pager.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <ipc_pager.h>
#include <address_space.h> #include <address_space.h>
#include <thread_sel4.h> #include <thread_sel4.h>
#include <install_mapping.h> #include <install_mapping.h>

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

@ -12,10 +12,10 @@
*/ */
/* Genode includes */ /* Genode includes */
#include <base/pager.h>
#include <base/sleep.h> #include <base/sleep.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <core_capability_space.h> #include <core_capability_space.h>
#include <install_mapping.h> #include <install_mapping.h>

2
repos/base/src/core/include/cpu_session_component.h
View File

@ -18,11 +18,11 @@
#include <util/list.h> #include <util/list.h>
#include <base/allocator_guard.h> #include <base/allocator_guard.h>
#include <base/lock.h> #include <base/lock.h>
#include <base/pager.h>
#include <base/rpc_server.h> #include <base/rpc_server.h>
#include <cpu_session/cpu_session.h> #include <cpu_session/cpu_session.h>
/* core includes */ /* core includes */
#include <pager.h>
#include <cpu_thread_allocator.h> #include <cpu_thread_allocator.h>
#include <platform_thread.h> #include <platform_thread.h>
#include <trace/control_area.h> #include <trace/control_area.h>

8
repos/base/include/base/pager.h → repos/base/src/core/include/pager.h
View File

@ -12,12 +12,12 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _INCLUDE__BASE__PAGER_H_ #ifndef _CORE__INCLUDE__PAGER_H_
#define _INCLUDE__BASE__PAGER_H_ #define _CORE__INCLUDE__PAGER_H_
#include <base/thread.h> #include <base/thread.h>
#include <base/thread_state.h> #include <base/thread_state.h>
#include <base/ipc_pager.h> #include <ipc_pager.h>
#include <base/printf.h> #include <base/printf.h>
#include <base/object_pool.h> #include <base/object_pool.h>
#include <base/signal.h> #include <base/signal.h>
@ -222,4 +222,4 @@ class Genode::Pager_activation : public Pager_activation_base
{ start(); } { start(); }
}; };
#endif /* _INCLUDE__BASE__PAGER_H_ */ #endif /* _CORE__INCLUDE__PAGER_H_ */

2
repos/base/src/core/include/rm_session_component.h
View File

@ -19,7 +19,7 @@
#include <base/stdint.h> #include <base/stdint.h>
#include <base/lock.h> #include <base/lock.h>
#include <base/capability.h> #include <base/capability.h>
#include <base/pager.h> #include <pager.h>
#include <base/allocator_avl.h> #include <base/allocator_avl.h>
#include <base/allocator_guard.h> #include <base/allocator_guard.h>
#include <base/sync_allocator.h> #include <base/sync_allocator.h>

4
repos/base/src/base/pager/common.cc → repos/base/src/core/pager_common.cc
View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
/* Genode includes */ /* core includes */
#include <base/pager.h> #include <pager.h>
using namespace Genode; using namespace Genode;