Fix build and execution of test/sel4
This commit is contained in:
parent
67b3c23281
commit
aaea28ae85
|
@ -10,6 +10,7 @@ SRC_CC += console/log_console.cc
|
||||||
SRC_CC += env/env.cc env/context_area.cc env/reinitialize.cc
|
SRC_CC += env/env.cc env/context_area.cc env/reinitialize.cc
|
||||||
SRC_CC += env/capability_space.cc
|
SRC_CC += env/capability_space.cc
|
||||||
SRC_CC += thread/thread_start.cc thread/thread_init.cc
|
SRC_CC += thread/thread_start.cc thread/thread_init.cc
|
||||||
|
SRC_CC += irq/platform.cc
|
||||||
|
|
||||||
INC_DIR += $(REP_DIR)/src/base
|
INC_DIR += $(REP_DIR)/src/base
|
||||||
INC_DIR += $(BASE_DIR)/src/base/env
|
INC_DIR += $(BASE_DIR)/src/base/env
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
# enable special handling in tool/run/boot_dir/sel4
|
||||||
|
set core_test "sel4"
|
||||||
|
|
||||||
build { test/sel4 }
|
build { test/sel4 }
|
||||||
|
|
||||||
create_boot_directory
|
create_boot_directory
|
||||||
|
|
|
@ -19,14 +19,17 @@ namespace Genode { struct Mini_env; }
|
||||||
|
|
||||||
struct Genode::Mini_env : Env
|
struct Genode::Mini_env : Env
|
||||||
{
|
{
|
||||||
Parent *parent() { return nullptr; }
|
Parent *parent() override { return nullptr; }
|
||||||
Ram_session *ram_session() { return nullptr; }
|
Ram_session *ram_session() override { return nullptr; }
|
||||||
Ram_session_capability ram_session_cap() { return Ram_session_capability(); }
|
Ram_session_capability ram_session_cap() override { return Ram_session_capability(); }
|
||||||
Cpu_session *cpu_session() { return nullptr; }
|
Cpu_session *cpu_session() override { return nullptr; }
|
||||||
Cpu_session_capability cpu_session_cap() { return Cpu_session_capability(); }
|
Cpu_session_capability cpu_session_cap() override { return Cpu_session_capability(); }
|
||||||
Rm_session *rm_session() { return nullptr; }
|
Rm_session *rm_session() override { return nullptr; }
|
||||||
Pd_session *pd_session() { return nullptr; }
|
Pd_session *pd_session() override { return nullptr; }
|
||||||
Allocator *heap() { return nullptr; }
|
Allocator *heap() override { return nullptr; }
|
||||||
|
|
||||||
|
void reinit(Native_capability::Dst, long) override { }
|
||||||
|
void reinit_main_thread(Rm_session_capability &) override { }
|
||||||
};
|
};
|
||||||
|
|
||||||
namespace Genode {
|
namespace Genode {
|
||||||
|
|
|
@ -9,7 +9,7 @@ LIBS = core_printf syscall
|
||||||
#
|
#
|
||||||
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
|
||||||
|
|
|
@ -39,6 +39,12 @@ static Thread_base::Context *main_context()
|
||||||
Thread_base *Thread_base::myself() { return nullptr; }
|
Thread_base *Thread_base::myself() { return nullptr; }
|
||||||
|
|
||||||
|
|
||||||
|
void Thread_base::name(char *dst, size_t dst_len)
|
||||||
|
{
|
||||||
|
strncpy(dst, _context->name, dst_len);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Thread_base::Thread_base(size_t, const char *name, size_t stack_size, Type type,
|
Thread_base::Thread_base(size_t, const char *name, size_t stack_size, Type type,
|
||||||
Cpu_session *cpu_session)
|
Cpu_session *cpu_session)
|
||||||
:
|
:
|
||||||
|
|
|
@ -27,8 +27,8 @@ proc run_boot_dir {binaries} {
|
||||||
# adapt to wether this is a core-internal test or a common scenario
|
# adapt to wether this is a core-internal test or a common scenario
|
||||||
global core_test
|
global core_test
|
||||||
if {[info exists core_test]} {
|
if {[info exists core_test]} {
|
||||||
set core_bin "test-[run_name]"
|
set core_bin "test-$core_test"
|
||||||
set core_target "test/[run_name]"
|
set core_target "test/$core_test"
|
||||||
} else {
|
} else {
|
||||||
set core_bin "core"
|
set core_bin "core"
|
||||||
set core_target "core"
|
set core_target "core"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user