From 3dae1c647e69823e3e5765a46ae5f707bc4a81d7 Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Date: Fri, 24 Oct 2014 12:13:06 +0200
Subject: [PATCH] rename source code from coredos -> dosek
Change-Id: I2c8ae268630700f552dfb82c887f5557d75e7156
---
CMakeLists.txt | 8 +-
app/CMakeLists.txt | 2 +-
app/bcc1/alarm1/CMakeLists.txt | 12 +-
app/bcc1/alarm2/CMakeLists.txt | 6 +-
app/bcc1/alarm3/CMakeLists.txt | 10 +-
app/bcc1/complex1/CMakeLists.txt | 8 +-
app/bcc1/complex2/CMakeLists.txt | 2 +-
app/bcc1/hoffmann/CMakeLists.txt | 2 +-
app/bcc1/isr2/CMakeLists.txt | 8 +-
app/bcc1/lukas/CMakeLists.txt | 6 +-
app/bcc1/resource1/CMakeLists.txt | 20 +--
app/bcc1/resource2/CMakeLists.txt | 4 +-
app/bcc1/sse1/CMakeLists.txt | 6 +-
app/bcc1/task1/CMakeLists.txt | 16 +--
app/bcc1/task2/CMakeLists.txt | 6 +-
app/benchmark/CMakeLists.txt | 2 +-
app/benchmark/complex1/CMakeLists.txt | 2 +-
app/benchmark/coptermock/CMakeLists.txt | 8 +-
.../coptermock/{coredos.cc => dosek.cc} | 0
app/sysmodel/1alarm/CMakeLists.txt | 4 +-
arch/arm/CMakeLists.txt | 32 ++---
arch/generic/CMakeLists.txt | 2 +-
arch/i386/CMakeLists.txt | 30 ++--
arch/i386/generate-pagetables.py | 2 +-
arch/i386/grub/CMakeLists.txt | 4 +-
arch/i386/grub/grub.cfg | 4 +-
arch/posix/CMakeLists.txt | 22 +--
doc/Mainpage.dox | 2 +-
doc/concepts/Evaluation.dox | 2 +-
doc/concepts/Overview.dox | 2 +-
eval/fail.sh | 2 +-
fail/CMakeLists.txt | 4 +-
fail/trace-analyze.py | 4 +-
fail/trace.h | 4 +-
generator/CMakeLists.txt | 4 +-
generator/Generator.py | 2 +-
generator/main.py | 4 +-
os/os.h | 4 +-
scripts/docker/Makefile | 4 +-
test/test.h | 4 +-
toolchain/ARM.cmake | 2 +-
toolchain/app.cmake | 132 +++++++++---------
toolchain/doxygen/CMakeLists.txt | 2 +-
toolchain/helpers.cmake | 2 +-
toolchain/i386.cmake | 2 +-
toolchain/llvm-link.py | 2 +-
toolchain/posix.cmake | 2 +-
47 files changed, 207 insertions(+), 207 deletions(-)
rename app/benchmark/coptermock/{coredos.cc => dosek.cc} (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64700a6..cc4473b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 2.6.2)
-PROJECT(CoRedOS)
+PROJECT(dOSEK)
enable_language(ASM)
enable_testing()
set(PROJECT_VERSION "0.1" CACHE STRING "Project version number")
@@ -66,8 +66,8 @@ set(ADDITIONAL_TARGETS "" CACHE INTERNAL STRING)
include(helpers)
# Include source directory
-coredos_include_dir(${PROJECT_SOURCE_DIR})
-coredos_include_dir(${PROJECT_SOURCE_DIR}/os)
+dosek_include_dir(${PROJECT_SOURCE_DIR})
+dosek_include_dir(${PROJECT_SOURCE_DIR}/os)
# Documentation
add_subdirectory(toolchain/doxygen)
@@ -79,7 +79,7 @@ set(EXECUTABLES "" CACHE INTERNAL "List of executables")
set(ARCH_INCLUDE_DIRS "" CACHE INTERNAL "Hardware dependent include directories")
add_subdirectory(arch)
foreach(ARCH_INCLUDE_DIR ${ARCH_INCLUDE_DIRS})
- coredos_include_dir(${ARCH_INCLUDE_DIR})
+ dosek_include_dir(${ARCH_INCLUDE_DIR})
endforeach()
# Tests
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index c658b6e..4606945 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,6 +1,6 @@
include(app)
-#set(COREDOS_APPS "bcc1_tasks" CACHE STRING "Application(s) to compile (semicolon seperated)")
+#set(DOSEK_APPS "bcc1_tasks" CACHE STRING "Application(s) to compile (semicolon seperated)")
SUBDIRLIST(SUBDIRS ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/app/bcc1/alarm1/CMakeLists.txt b/app/bcc1/alarm1/CMakeLists.txt
index 7f272c9..db468ef 100644
--- a/app/bcc1/alarm1/CMakeLists.txt
+++ b/app/bcc1/alarm1/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm1a
SYSTEM_XML system.xml
VERIFY verify_a.py
@@ -7,7 +7,7 @@ COREDOS_BINARY(
a.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm1b
SYSTEM_XML system.xml
VERIFY verify_b.py
@@ -16,7 +16,7 @@ COREDOS_BINARY(
b.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm1c
SYSTEM_XML system.xml
VERIFY verify_c.py
@@ -25,7 +25,7 @@ COREDOS_BINARY(
c.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm1d
SYSTEM_XML system.xml
VERIFY verify_d.py
@@ -34,7 +34,7 @@ COREDOS_BINARY(
d.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm1e
SYSTEM_XML system.xml
VERIFY verify_e.py
@@ -44,7 +44,7 @@ COREDOS_BINARY(
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm1f
SYSTEM_XML system.xml
# VERIFY verify_f.py
diff --git a/app/bcc1/alarm2/CMakeLists.txt b/app/bcc1/alarm2/CMakeLists.txt
index 09e5166..bd1e849 100644
--- a/app/bcc1/alarm2/CMakeLists.txt
+++ b/app/bcc1/alarm2/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm2a
SYSTEM_XML system.xml
LIBS libtest
@@ -6,7 +6,7 @@ COREDOS_BINARY(
a.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm2b
SYSTEM_XML system.xml
LIBS libtest
@@ -14,7 +14,7 @@ COREDOS_BINARY(
b.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm2c
SYSTEM_XML system.xml
LIBS libtest
diff --git a/app/bcc1/alarm3/CMakeLists.txt b/app/bcc1/alarm3/CMakeLists.txt
index f2db528..45cdaa9 100644
--- a/app/bcc1/alarm3/CMakeLists.txt
+++ b/app/bcc1/alarm3/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm3a
SYSTEM_XML system.xml
VERIFY verify_a.py
@@ -7,7 +7,7 @@ COREDOS_BINARY(
a.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm3b
SYSTEM_XML system.xml
VERIFY verify_b.py
@@ -16,7 +16,7 @@ COREDOS_BINARY(
b.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm3c
SYSTEM_XML system.xml
VERIFY verify_c.py
@@ -25,7 +25,7 @@ COREDOS_BINARY(
c.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm3d
SYSTEM_XML system.xml
VERIFY verify_d.py
@@ -34,7 +34,7 @@ COREDOS_BINARY(
d.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_alarm3e
SYSTEM_XML system.xml
VERIFY verify_e.py
diff --git a/app/bcc1/complex1/CMakeLists.txt b/app/bcc1/complex1/CMakeLists.txt
index 827435e..3c381f3 100644
--- a/app/bcc1/complex1/CMakeLists.txt
+++ b/app/bcc1/complex1/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_complex1a
SYSTEM_XML system.xml
VERIFY verify_a.py
@@ -7,7 +7,7 @@ COREDOS_BINARY(
a.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_complex1b
SYSTEM_XML system.xml
VERIFY verify_b.py
@@ -16,7 +16,7 @@ COREDOS_BINARY(
b.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_complex1c
SYSTEM_XML system.xml
VERIFY verify_c.py
@@ -25,7 +25,7 @@ COREDOS_BINARY(
c.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_complex1d
SYSTEM_XML system.xml
LIBS libtest
diff --git a/app/bcc1/complex2/CMakeLists.txt b/app/bcc1/complex2/CMakeLists.txt
index c49f105..2591632 100644
--- a/app/bcc1/complex2/CMakeLists.txt
+++ b/app/bcc1/complex2/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_complex2a
SYSTEM_XML system.xml
VERIFY verify_a.py
diff --git a/app/bcc1/hoffmann/CMakeLists.txt b/app/bcc1/hoffmann/CMakeLists.txt
index dd29029..8c97956 100644
--- a/app/bcc1/hoffmann/CMakeLists.txt
+++ b/app/bcc1/hoffmann/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME hoffmann_task1a
SYSTEM_XML system.xml
a.cc
diff --git a/app/bcc1/isr2/CMakeLists.txt b/app/bcc1/isr2/CMakeLists.txt
index 3ebd487..870c105 100644
--- a/app/bcc1/isr2/CMakeLists.txt
+++ b/app/bcc1/isr2/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_isr2a
SYSTEM_XML system.xml
VERIFY verify_a.py
@@ -7,7 +7,7 @@ COREDOS_BINARY(
a.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_isr2b
SYSTEM_XML system.xml
VERIFY verify_b.py
@@ -16,7 +16,7 @@ COREDOS_BINARY(
b.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_isr2c
SYSTEM_XML system.xml
VERIFY verify_c.py
@@ -25,7 +25,7 @@ COREDOS_BINARY(
c.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_isr2d
SYSTEM_XML system.xml
VERIFY verify_d.py
diff --git a/app/bcc1/lukas/CMakeLists.txt b/app/bcc1/lukas/CMakeLists.txt
index c0c62be..f763861 100644
--- a/app/bcc1/lukas/CMakeLists.txt
+++ b/app/bcc1/lukas/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_lukas_dispatch
SYSTEM_XML dispatch.xml
LIBS libtest
@@ -7,7 +7,7 @@ COREDOS_BINARY(
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_lukas_alarmstress
SYSTEM_XML alarmstress.xml
LIBS libtest
@@ -15,7 +15,7 @@ COREDOS_BINARY(
alarmstress.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_lukas_isr2
SYSTEM_XML isr2.xml
LIBS libtest
diff --git a/app/bcc1/resource1/CMakeLists.txt b/app/bcc1/resource1/CMakeLists.txt
index e35c4fa..aaa1607 100644
--- a/app/bcc1/resource1/CMakeLists.txt
+++ b/app/bcc1/resource1/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_resource1a
SYSTEM_XML system.xml
LIBS libtest
@@ -7,7 +7,7 @@ COREDOS_BINARY(
a.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_resource1b
SYSTEM_XML system.xml
LIBS libtest
@@ -16,7 +16,7 @@ COREDOS_BINARY(
b.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_resource1c
SYSTEM_XML system.xml
LIBS libtest
@@ -25,7 +25,7 @@ COREDOS_BINARY(
c.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_resource1d
SYSTEM_XML system.xml
LIBS libtest
@@ -34,7 +34,7 @@ COREDOS_BINARY(
d.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_resource1e
SYSTEM_XML system.xml
LIBS libtest
@@ -43,7 +43,7 @@ COREDOS_BINARY(
e.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_resource1f
SYSTEM_XML system.xml
LIBS libtest
@@ -53,7 +53,7 @@ COREDOS_BINARY(
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_resource1g
SYSTEM_XML system.xml
LIBS libtest
@@ -62,7 +62,7 @@ COREDOS_BINARY(
g.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_resource1h
SYSTEM_XML system.xml
LIBS libtest
@@ -71,7 +71,7 @@ COREDOS_BINARY(
h.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_resource1j
SYSTEM_XML system.xml
LIBS libtest
@@ -80,7 +80,7 @@ COREDOS_BINARY(
j.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_resource1k
SYSTEM_XML system.xml
LIBS libtest
diff --git a/app/bcc1/resource2/CMakeLists.txt b/app/bcc1/resource2/CMakeLists.txt
index 7e76d4f..7169869 100644
--- a/app/bcc1/resource2/CMakeLists.txt
+++ b/app/bcc1/resource2/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_resource2a
SYSTEM_XML system.xml
VERIFY verify_a.py
@@ -7,7 +7,7 @@ COREDOS_BINARY(
a.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_resource2b
SYSTEM_XML system.xml
VERIFY verify_b.py
diff --git a/app/bcc1/sse1/CMakeLists.txt b/app/bcc1/sse1/CMakeLists.txt
index 2d85327..b76b18b 100644
--- a/app/bcc1/sse1/CMakeLists.txt
+++ b/app/bcc1/sse1/CMakeLists.txt
@@ -1,6 +1,6 @@
# SSE is the symbolic system execution
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_sse1a
SYSTEM_XML system.xml
LIBS libtest
@@ -9,7 +9,7 @@ COREDOS_BINARY(
a.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_sse1b
SYSTEM_XML system.xml
LIBS libtest
@@ -19,7 +19,7 @@ COREDOS_BINARY(
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_sse1c
SYSTEM_XML system.xml
LIBS libtest
diff --git a/app/bcc1/task1/CMakeLists.txt b/app/bcc1/task1/CMakeLists.txt
index 806e2bc..90af463 100644
--- a/app/bcc1/task1/CMakeLists.txt
+++ b/app/bcc1/task1/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_task1a
SYSTEM_XML system.xml
VERIFY verify_a.py
@@ -7,7 +7,7 @@ COREDOS_BINARY(
a.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_task1a_sse
SYSTEM_XML system.xml
VERIFY verify_a.py
@@ -17,7 +17,7 @@ COREDOS_BINARY(
a.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_task1b
SYSTEM_XML system.xml
VERIFY verify_b.py
@@ -26,7 +26,7 @@ COREDOS_BINARY(
b.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_task1c
SYSTEM_XML system.xml
VERIFY verify_c.py
@@ -35,7 +35,7 @@ COREDOS_BINARY(
c.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_task1d
SYSTEM_XML system.xml
VERIFY verify_d.py
@@ -44,7 +44,7 @@ COREDOS_BINARY(
d.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_task1e
SYSTEM_XML system.xml
VERIFY verify_e.py
@@ -53,7 +53,7 @@ COREDOS_BINARY(
e.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_task1f
SYSTEM_XML system.xml
VERIFY verify_f.py
@@ -62,7 +62,7 @@ COREDOS_BINARY(
f.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_task1g
SYSTEM_XML system.xml
VERIFY verify_g.py
diff --git a/app/bcc1/task2/CMakeLists.txt b/app/bcc1/task2/CMakeLists.txt
index f546442..c211f1f 100644
--- a/app/bcc1/task2/CMakeLists.txt
+++ b/app/bcc1/task2/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_task2a
SYSTEM_XML system.xml
VERIFY verify_a.py
@@ -7,7 +7,7 @@ COREDOS_BINARY(
a.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_task2b
SYSTEM_XML system.xml
VERIFY verify_b.py
@@ -16,7 +16,7 @@ COREDOS_BINARY(
b.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bcc1_task2c
SYSTEM_XML system.xml
VERIFY verify_a.py
diff --git a/app/benchmark/CMakeLists.txt b/app/benchmark/CMakeLists.txt
index 5a98c9e..3551dc8 100644
--- a/app/benchmark/CMakeLists.txt
+++ b/app/benchmark/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bench-task1a
SYSTEM_XML system.xml
FAIL
diff --git a/app/benchmark/complex1/CMakeLists.txt b/app/benchmark/complex1/CMakeLists.txt
index 1c169fc..a0bf876 100644
--- a/app/benchmark/complex1/CMakeLists.txt
+++ b/app/benchmark/complex1/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bench-complex1d
SYSTEM_XML system.xml
FAIL
diff --git a/app/benchmark/coptermock/CMakeLists.txt b/app/benchmark/coptermock/CMakeLists.txt
index e500464..13a4ff6 100644
--- a/app/benchmark/coptermock/CMakeLists.txt
+++ b/app/benchmark/coptermock/CMakeLists.txt
@@ -1,13 +1,13 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME bench-coptermock
SYSTEM_XML system.xml
FAIL
- coredos.cc
+ dosek.cc
)
## Should result in 1579971 system states for SSE
-#COREDOS_BINARY(
+#DOSEK_BINARY(
# NAME bench-coptermock-no-annotation
# SYSTEM_XML system-no-annotation.xml
-# coredos.cc
+# dosek.cc
#)
diff --git a/app/benchmark/coptermock/coredos.cc b/app/benchmark/coptermock/dosek.cc
similarity index 100%
rename from app/benchmark/coptermock/coredos.cc
rename to app/benchmark/coptermock/dosek.cc
diff --git a/app/sysmodel/1alarm/CMakeLists.txt b/app/sysmodel/1alarm/CMakeLists.txt
index d218ffa..b61d571 100644
--- a/app/sysmodel/1alarm/CMakeLists.txt
+++ b/app/sysmodel/1alarm/CMakeLists.txt
@@ -1,4 +1,4 @@
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME sysmodel_1alarm_a
SYSTEM_XML a.xml
VERIFY verify_a.py
@@ -7,7 +7,7 @@ COREDOS_BINARY(
a.cc
)
-COREDOS_BINARY(
+DOSEK_BINARY(
NAME sysmodel_1alarm_aa
SYSTEM_XML aa.xml # OTHER XML!
VERIFY verify_aa.py
diff --git a/arch/arm/CMakeLists.txt b/arch/arm/CMakeLists.txt
index 6465e24..0fc45aa 100644
--- a/arch/arm/CMakeLists.txt
+++ b/arch/arm/CMakeLists.txt
@@ -11,7 +11,7 @@ message(STATUS "[${PROJECT_NAME}] Using port ${DEBUG_PORT} for debug stub")
# Include platform-specific files
add_subdirectory(platforms)
-coredos_include_dir(${ARCH_INCLUDE_DIRS})
+dosek_include_dir(${ARCH_INCLUDE_DIRS})
# Build option to disable MMU protection
option(MPU_PROTECTION "Use MPU protection" OFF)
@@ -48,7 +48,7 @@ add_library(arch ${SRCS})
target_link_libraries(arch generic)
# Add to include directories
-coredos_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
+dosek_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
set(ARCH_INCLUDE_DIRS ${ARCH_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL STRING)
# Set linker script template
@@ -57,21 +57,21 @@ set(LINKER_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld.in CACHE INTERNAL STRI
# Find objdump for pagetable generation
find_program(OBJDUMP "${ARCH_PREFIX}objdump")
-# ARM CoRedOS executable macro
-# usage: coredos_executable(ELFFILE ... [DEFINTIONS ...])
-# Creates CoRedOS executable named ELFFILE. All parameters after ELFFILE until
+# ARM dOSEK executable macro
+# usage: dosek_executable(ELFFILE ... [DEFINTIONS ...])
+# Creates dOSEK executable named ELFFILE. All parameters after ELFFILE until
# (optional) DEFINITIONS are passed directly to add_executable.
# To set compile definitions specify them after DEFINITIONS keyword.
-macro(coredos_executable ELFFILE)
+macro(dosek_executable ELFFILE)
# parse DEFINITIONS
set(options "EXCLUDE_FROM_ALL")
set(oneValueArgs "LINKER_SCRIPT")
set(multiValuedParameters DEFINITIONS LIBS SOURCES)
- cmake_parse_arguments(COREDOS_EXECUTABLE "${options}" "${oneValueArgs}" "${multiValuedParameters}" ${ARGN} )
- set(SOURCES ${COREDOS_EXECUTABLE_SOURCES} ${COREDOS_EXECUTABLE_UNPARSED_ARGUMENTS})
- set(DEFINITIONS ${COREDOS_EXECUTABLE_DEFINITIONS})
+ cmake_parse_arguments(DOSEK_EXECUTABLE "${options}" "${oneValueArgs}" "${multiValuedParameters}" ${ARGN} )
+ set(SOURCES ${DOSEK_EXECUTABLE_SOURCES} ${DOSEK_EXECUTABLE_UNPARSED_ARGUMENTS})
+ set(DEFINITIONS ${DOSEK_EXECUTABLE_DEFINITIONS})
set(ADD_EXECUTABLE_OPTIONS "")
- if(${COREDOS_EXECUTABLE_EXCLUDE_FROM_ALL} STREQUAL "TRUE")
+ if(${DOSEK_EXECUTABLE_EXCLUDE_FROM_ALL} STREQUAL "TRUE")
set(ADD_EXECUTABLE_OPTIONS "EXCLUDE_FROM_ALL")
endif()
@@ -80,7 +80,7 @@ macro(coredos_executable ELFFILE)
get_filename_component(ELFNAME ${ELFFILE} NAME_WE)
# libraries to link with application
- set(TARGET_LIBS os arch ${COREDOS_EXECUTABLE_LIBS})
+ set(TARGET_LIBS os arch ${DOSEK_EXECUTABLE_LIBS})
# First executable with empty, weak page tables
set(PRELINK ${ELFNAME}.prelink.elf)
@@ -103,14 +103,14 @@ macro(coredos_executable ELFFILE)
target_link_libraries(${ELFFILE} ${TARGET_LIBS})
# set definitions
- if(COREDOS_EXECUTABLE_DEFINITIONS)
- set_target_properties(${ELFFILE} ${PRELINK} PROPERTIES COMPILE_DEFINITIONS ${COREDOS_EXECUTABLE_DEFINITIONS})
+ if(DOSEK_EXECUTABLE_DEFINITIONS)
+ set_target_properties(${ELFFILE} ${PRELINK} PROPERTIES COMPILE_DEFINITIONS ${DOSEK_EXECUTABLE_DEFINITIONS})
endif()
# Set custom linker script/flags
# libgcc added here to be used as needed (compiler helper functions)and not included in full
- if(COREDOS_EXECUTABLE_LINKER_SCRIPT)
- set(LINKER_SCRIPT ${COREDOS_EXECUTABLE_LINKER_SCRIPT})
+ if(DOSEK_EXECUTABLE_LINKER_SCRIPT)
+ set(LINKER_SCRIPT ${DOSEK_EXECUTABLE_LINKER_SCRIPT})
else()
set(LINKER_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/${ELFNAME}_linker.ld)
endif()
@@ -129,7 +129,7 @@ macro(coredos_executable ELFFILE)
endmacro()
-macro(coredos_add_test FN)
+macro(dosek_add_test FN)
add_test(${FN} ${GEM5} ${GEM5_OPTIONS} ; cat m5out/system.terminal)
set_tests_properties(${FN} PROPERTIES PASS_REGULAR_EXPRESSION "SUCCESS.+ALL OK" FAIL_REGULAR_EXPRESSION "FAIL" TIMEOUT 20)
add_dependencies( tests iso-${FN} )
diff --git a/arch/generic/CMakeLists.txt b/arch/generic/CMakeLists.txt
index d338732..bbc5a62 100644
--- a/arch/generic/CMakeLists.txt
+++ b/arch/generic/CMakeLists.txt
@@ -3,7 +3,7 @@ set(SRCS
)
# Add to include directories
-coredos_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
+dosek_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
set(ARCH_INCLUDE_DIRS ${ARCH_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL STRING)
# Link startup code into library
diff --git a/arch/i386/CMakeLists.txt b/arch/i386/CMakeLists.txt
index 88e2ad5..7241a97 100644
--- a/arch/i386/CMakeLists.txt
+++ b/arch/i386/CMakeLists.txt
@@ -60,7 +60,7 @@ add_library(arch ${SRCS})
target_link_libraries(arch generic)
# Add to include directories
-coredos_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
+dosek_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
set(ARCH_INCLUDE_DIRS ${ARCH_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL STRING)
# Set linker script template
@@ -69,21 +69,21 @@ set(LINKER_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/linker.ld.in CACHE INTERNAL STRI
# Find objdump for pagetable generation
find_program(OBJDUMP "objdump")
-# i386 CoRedOS executable macro
-# usage: coredos_executable(ELFFILE ... [DEFINTIONS ...])
-# Creates CoRedOS executable named ELFFILE. All parameters after ELFFILE until
+# i386 dOSEK executable macro
+# usage: dosek_executable(ELFFILE ... [DEFINTIONS ...])
+# Creates dOSEK executable named ELFFILE. All parameters after ELFFILE until
# (optional) DEFINITIONS are passed directly to add_executable.
# To set compile definitions specify them after DEFINITIONS keyword.
-macro(coredos_executable ELFFILE)
+macro(dosek_executable ELFFILE)
# parse DEFINITIONS
set(options "EXCLUDE_FROM_ALL")
set(oneValueArgs "LINKER_SCRIPT")
set(multiValuedParameters DEFINITIONS LIBS SOURCES)
- cmake_parse_arguments(COREDOS_EXECUTABLE "${options}" "${oneValueArgs}" "${multiValuedParameters}" ${ARGN} )
- set(SOURCES ${COREDOS_EXECUTABLE_SOURCES} ${COREDOS_EXECUTABLE_UNPARSED_ARGUMENTS})
- set(DEFINITIONS ${COREDOS_EXECUTABLE_DEFINITIONS})
+ cmake_parse_arguments(DOSEK_EXECUTABLE "${options}" "${oneValueArgs}" "${multiValuedParameters}" ${ARGN} )
+ set(SOURCES ${DOSEK_EXECUTABLE_SOURCES} ${DOSEK_EXECUTABLE_UNPARSED_ARGUMENTS})
+ set(DEFINITIONS ${DOSEK_EXECUTABLE_DEFINITIONS})
set(ADD_EXECUTABLE_OPTIONS "")
- if(${COREDOS_EXECUTABLE_EXCLUDE_FROM_ALL} STREQUAL "TRUE")
+ if(${DOSEK_EXECUTABLE_EXCLUDE_FROM_ALL} STREQUAL "TRUE")
set(ADD_EXECUTABLE_OPTIONS "EXCLUDE_FROM_ALL")
endif()
@@ -92,7 +92,7 @@ macro(coredos_executable ELFFILE)
get_filename_component(ELFNAME ${ELFFILE} NAME_WE)
# libraries to link with application
- set(TARGET_LIBS os arch ${COREDOS_EXECUTABLE_LIBS})
+ set(TARGET_LIBS os arch ${DOSEK_EXECUTABLE_LIBS})
# First executable with empty, weak page tables
set(PRELINK ${ELFNAME}.prelink.elf)
@@ -115,14 +115,14 @@ macro(coredos_executable ELFFILE)
target_link_libraries(${ELFFILE} ${TARGET_LIBS})
# set definitions
- if(COREDOS_EXECUTABLE_DEFINITIONS)
- set_target_properties(${ELFFILE} ${PRELINK} PROPERTIES COMPILE_DEFINITIONS ${COREDOS_EXECUTABLE_DEFINITIONS})
+ if(DOSEK_EXECUTABLE_DEFINITIONS)
+ set_target_properties(${ELFFILE} ${PRELINK} PROPERTIES COMPILE_DEFINITIONS ${DOSEK_EXECUTABLE_DEFINITIONS})
endif()
# Set custom linker script/flags
# libgcc added here to be used as needed (compiler helper functions)and not included in full
- if(COREDOS_EXECUTABLE_LINKER_SCRIPT)
- set(LINKER_SCRIPT ${COREDOS_EXECUTABLE_LINKER_SCRIPT})
+ if(DOSEK_EXECUTABLE_LINKER_SCRIPT)
+ set(LINKER_SCRIPT ${DOSEK_EXECUTABLE_LINKER_SCRIPT})
else()
set(LINKER_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/${ELFNAME}_linker.ld)
endif()
@@ -141,7 +141,7 @@ macro(coredos_executable ELFFILE)
endmacro()
-macro(coredos_add_test FN)
+macro(dosek_add_test FN)
add_test(${FN} qemu-system-i386 -no-reboot -machine pc,accel=tcg -m ${RAM_SIZE} -nographic -cdrom "${PROJECT_BINARY_DIR}/${FN}.iso")
set_tests_properties(${FN} PROPERTIES PASS_REGULAR_EXPRESSION "SUCCESS.+ALL OK" FAIL_REGULAR_EXPRESSION "FAIL" TIMEOUT 20)
add_dependencies( tests iso-${FN} )
diff --git a/arch/i386/generate-pagetables.py b/arch/i386/generate-pagetables.py
index cdbe944..7bbf078 100755
--- a/arch/i386/generate-pagetables.py
+++ b/arch/i386/generate-pagetables.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-"""Generate static C++ pagetables from given CoRedOS ELF file."""
+"""Generate static C++ pagetables from given dOSEK ELF file."""
import os, sys
from optparse import OptionParser
diff --git a/arch/i386/grub/CMakeLists.txt b/arch/i386/grub/CMakeLists.txt
index d7b4765..637a7b5 100644
--- a/arch/i386/grub/CMakeLists.txt
+++ b/arch/i386/grub/CMakeLists.txt
@@ -29,9 +29,9 @@ foreach(ELF ${EXECUTABLES})
# Create bootable ISO from ELF
add_custom_command(
DEPENDS ${ELF}
- COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${ELF}> ${BOOTDIR}/coredos.elf
+ COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${ELF}> ${BOOTDIR}/dosek.elf
COMMAND ${GRUB_MKRESCUE} -o ${ISOFILE} ${ISODIR}
- COMMAND ${CMAKE_COMMAND} -E remove ${BOOTDIR}/coredos.elf
+ COMMAND ${CMAKE_COMMAND} -E remove ${BOOTDIR}/dosek.elf
COMMENT "[${PROJECT_NAME}] Generating bootable grub iso."
OUTPUT ${ISOFILE}
)
diff --git a/arch/i386/grub/grub.cfg b/arch/i386/grub/grub.cfg
index 5555f77..7c5aa6c 100644
--- a/arch/i386/grub/grub.cfg
+++ b/arch/i386/grub/grub.cfg
@@ -1,7 +1,7 @@
set timeout=0
set default=0
-menuentry "CoRedOS" {
- multiboot /boot/coredos.elf
+menuentry "dOSEK" {
+ multiboot /boot/dosek.elf
boot
}
diff --git a/arch/posix/CMakeLists.txt b/arch/posix/CMakeLists.txt
index 6781a70..e6a0127 100644
--- a/arch/posix/CMakeLists.txt
+++ b/arch/posix/CMakeLists.txt
@@ -31,7 +31,7 @@ add_library(arch ${SRCS})
target_link_libraries(arch generic)
# Add to include directories
-coredos_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
+dosek_include_dir(${CMAKE_CURRENT_SOURCE_DIR})
set(ARCH_INCLUDE_DIRS ${ARCH_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL STRING)
# Setup linker script
@@ -41,16 +41,16 @@ set(ARCH_INCLUDE_DIRS ${ARCH_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} CACHE INT
# Show target specific sources, linker script
#message(STATUS "Linker script: ${LINKER_SCRIPT}")
-# POSIX CoRedOS executable macro
-macro(coredos_executable ELFFILE)
+# POSIX dOSEK executable macro
+macro(dosek_executable ELFFILE)
set(options "EXCLUDE_FROM_ALL")
set(oneValueArgs "LINKER_SCRIPT")
set(multiValuedParameters DEFINITIONS LIBS SOURCES)
- cmake_parse_arguments(COREDOS_EXECUTABLE "${options}" "${oneValueArgs}" "${multiValuedParameters}" ${ARGN} )
- set(SOURCES ${COREDOS_EXECUTABLE_SOURCES} ${COREDOS_EXECUTABLE_UNPARSED_ARGUMENTS})
- set(DEFINITIONS ${COREDOS_EXECUTABLE_DEFINITIONS})
+ cmake_parse_arguments(DOSEK_EXECUTABLE "${options}" "${oneValueArgs}" "${multiValuedParameters}" ${ARGN} )
+ set(SOURCES ${DOSEK_EXECUTABLE_SOURCES} ${DOSEK_EXECUTABLE_UNPARSED_ARGUMENTS})
+ set(DEFINITIONS ${DOSEK_EXECUTABLE_DEFINITIONS})
set(ADD_EXECUTABLE_OPTIONS "")
- if(${COREDOS_EXECUTABLE_EXCLUDE_FROM_ALL} STREQUAL "TRUE")
+ if(${DOSEK_EXECUTABLE_EXCLUDE_FROM_ALL} STREQUAL "TRUE")
set(ADD_EXECUTABLE_OPTIONS "EXCLUDE_FROM_ALL")
endif()
@@ -58,15 +58,15 @@ macro(coredos_executable ELFFILE)
get_filename_component(ELFNAME ${ELFFILE} NAME_WE)
# libraries to link with application
- set(TARGET_LIBS os arch ${COREDOS_EXECUTABLE_LIBS})
+ set(TARGET_LIBS os arch ${DOSEK_EXECUTABLE_LIBS})
# The actual executable
add_executable(${ELFFILE} ${ADD_EXECUTABLE_OPTIONS} ${SOURCES})
target_link_libraries(${ELFFILE} ${TARGET_LIBS})
# set definitions
- if(COREDOS_EXECUTABLE_DEFINITIONS)
- set_target_properties(${ELFFILE} PROPERTIES COMPILE_DEFINITIONS ${COREDOS_EXECUTABLE_DEFINITIONS})
+ if(DOSEK_EXECUTABLE_DEFINITIONS)
+ set_target_properties(${ELFFILE} PROPERTIES COMPILE_DEFINITIONS ${DOSEK_EXECUTABLE_DEFINITIONS})
endif()
@@ -86,7 +86,7 @@ macro(coredos_executable ELFFILE)
set(EXECUTABLES ${EXECUTABLES} ${ELFFILE} CACHE INTERNAL STRING)
endmacro()
-macro(coredos_add_test FN)
+macro(dosek_add_test FN)
add_test(${FN} ${PROJECT_BINARY_DIR}/${FN})
set_tests_properties(${FN} PROPERTIES PASS_REGULAR_EXPRESSION "SUCCESS.+ALL OK" FAIL_REGULAR_EXPRESSION "FAIL" TIMEOUT 10)
add_dependencies( tests ${FN} )
diff --git a/doc/Mainpage.dox b/doc/Mainpage.dox
index 724daeb..5b68456 100644
--- a/doc/Mainpage.dox
+++ b/doc/Mainpage.dox
@@ -3,7 +3,7 @@
-CoRedOS - Combined Redundancy Operating System
+dOSEK - Combined Redundancy Operating System
==============================================
diff --git a/doc/concepts/Evaluation.dox b/doc/concepts/Evaluation.dox
index d80cf4b..672e51b 100644
--- a/doc/concepts/Evaluation.dox
+++ b/doc/concepts/Evaluation.dox
@@ -3,7 +3,7 @@
We use a recent version of the [I4Copter](https://www4.cs.fau.de/trac/I4Copter) system as real world evaluation scenario.
The I4Copter system architecture allows to separate functional application code from non-functional OS interaction.
-Therefore, we are able to exchange the underlying operating systems easily and evaluate our ''CoRedOS'' and a usual COTS eCos system.
+Therefore, we are able to exchange the underlying operating systems easily and evaluate our ''dOSEK'' and a usual COTS eCos system.
In a first phase we mocked the functional application code and mimic the original execution behavior.
### Fault Injection Parameters ###
diff --git a/doc/concepts/Overview.dox b/doc/concepts/Overview.dox
index 71dc587..c6cfeac 100644
--- a/doc/concepts/Overview.dox
+++ b/doc/concepts/Overview.dox
@@ -1,6 +1,6 @@
/**
* @page concept_overview Design Concept
- * @brief __CoRedOS maxim: Use all (a priori) knowledge of the behaviour of a OSEK system to leverage effective dependability measures.__
+ * @brief __dOSEK maxim: Use all (a priori) knowledge of the behaviour of a OSEK system to leverage effective dependability measures.__
*
* We claim a static system design is the right choice for a dependable RTOS: @subpage static_design
*
diff --git a/eval/fail.sh b/eval/fail.sh
index 99b9afe..f1f3b66 100755
--- a/eval/fail.sh
+++ b/eval/fail.sh
@@ -30,7 +30,7 @@ make fail-$BENCH-regs
make fail-$BENCH-mem
make fail-$BENCH-ip
-VARIANT=CoRedOS-`cat fail-$BENCH/.gitrev`
+VARIANT=dOSEK-`cat fail-$BENCH/.gitrev`
NAME=$VARIANT-$BENCH-encoded-mpu
objdump -wC -t -j .data -j .text fail-$BENCH/fail-$BENCH > $START_DIR/$NAME.syms
cp fail-$BENCH/fail-$BENCH $START_DIR/$NAME.elf
diff --git a/fail/CMakeLists.txt b/fail/CMakeLists.txt
index be2fa72..94c42f6 100644
--- a/fail/CMakeLists.txt
+++ b/fail/CMakeLists.txt
@@ -114,9 +114,9 @@ macro(fail_targets TNAME ELF TEST)
set(TRACEFILE "${FAIL_DIR}/trace.pb")
set(CHECKPOINTFILE "${FAIL_DIR}/checkpoint.trace")
set(STATEDIR "${FAIL_DIR}/state")
- set(STATS_BINARY ${COREDOS_GENERATOR_DIR}/stats_binary.py)
+ set(STATS_BINARY ${DOSEK_GENERATOR_DIR}/stats_binary.py)
set(STATS_TRACE ${PROJECT_SOURCE_DIR}/fail/trace-analyze.py)
- set(STATS_DICT ${COREDOS_OUTPUT_DIR}/stats.dict.py)
+ set(STATS_DICT ${DOSEK_OUTPUT_DIR}/stats.dict.py)
add_custom_command(
DEPENDS ${ELF} iso-fail-${TNAME} ${GIT_REV_FILE} fail-trace-plugin-python ${STATS_BINARY} ${STATS_TRACE}
COMMAND ${PYTHON} ${CHECK_WORKSPACE} -w ${PROJECT_SOURCE_DIR} -o ${GIT_REV_FILE} -g ${GIT}
diff --git a/fail/trace-analyze.py b/fail/trace-analyze.py
index 2f26f1f..6f4593c 100755
--- a/fail/trace-analyze.py
+++ b/fail/trace-analyze.py
@@ -67,7 +67,7 @@ class SymbolMap(dict):
self[i] = symbol
self[symbol.name] = symbol
-class CoredosDetector:
+class dOSEKDetector:
START = 1
WITHIN = 2
END = 4
@@ -186,7 +186,7 @@ class SyscallRegion:
def syscall_regions(trace_events, symbol_map):
"""Generator that returns detected syscall regions"""
last_addr = current_addr = next_addr = None
- detector = CoredosDetector(symbol_map)
+ detector = dOSEKDetector(symbol_map)
region = None
diff --git a/fail/trace.h b/fail/trace.h
index 4aceb3e..6d9e80f 100644
--- a/fail/trace.h
+++ b/fail/trace.h
@@ -40,7 +40,7 @@ noinline void test_finish()
inlinehint void test_main(void)
{
debug.setcolor(Color::RED, Color::WHITE);
- debug << "CoRedOS start" << endl;
+ debug << "dOSEK start" << endl;
debug.setcolor(Color::YELLOW, Color::BLACK);
// run tests
@@ -51,7 +51,7 @@ inlinehint void test_main(void)
// halt system
debug.setcolor(Color::RED, Color::WHITE);
- debug << "CoRedOS halt" << endl;
+ debug << "dOSEK halt" << endl;
Machine::shutdown();
}
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index 94d2896..1f720d6 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -10,6 +10,6 @@ foreach(module ${PYTHON_MODULES_TEST})
COMMAND env PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/../ python3 ${CMAKE_CURRENT_SOURCE_DIR}/${module}.py)
endforeach(module)
-SET(COREDOS_GENERATOR_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "")
-SET(COREDOS_GENERATOR "${CMAKE_CURRENT_SOURCE_DIR}/main.py" CACHE INTERNAL "")
+SET(DOSEK_GENERATOR_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "")
+SET(DOSEK_GENERATOR "${CMAKE_CURRENT_SOURCE_DIR}/main.py" CACHE INTERNAL "")
diff --git a/generator/Generator.py b/generator/Generator.py
index d4904e8..d939ad8 100644
--- a/generator/Generator.py
+++ b/generator/Generator.py
@@ -102,7 +102,7 @@ class Generator:
"""Generate into output file"""
self.file_prefix = output_file_prefix
self.source_file = SourceFile()
- self.source_files["coredos.cc"] = self.source_file
+ self.source_files["dosek.cc"] = self.source_file
#include "os.h"
diff --git a/generator/main.py b/generator/main.py
index 8e19556..e6b1817 100755
--- a/generator/main.py
+++ b/generator/main.py
@@ -50,11 +50,11 @@ if __name__ == "__main__":
parser.add_option("", "--rtsc-analyze-xml",
metavar="RTSC_ANALYZE_XML", help="the RTSC Analyze file")
parser.add_option("-p", "--prefix",
- metavar="DIR", help="where to place the coredos source (prefix)")
+ metavar="DIR", help="where to place the dosek source (prefix)")
parser.add_option("-n", "--name",
metavar="STRING", help="system name")
parser.add_option("-a", "--arch",
- metavar="STRING", help="for which coredos architecture?")
+ metavar="STRING", help="for which dosek architecture?")
parser.add_option('-v', '--verbose', dest='verbose', action='count',
help="increase verbosity (specify multiple times for more)",
default = 0)
diff --git a/os/os.h b/os/os.h
index ac031c0..52cfa26 100644
--- a/os/os.h
+++ b/os/os.h
@@ -1,5 +1,5 @@
-#ifndef _COREDOS_OS_OS_H_
-#define _COREDOS_OS_OS_H_
+#ifndef _DOSEK_OS_OS_H_
+#define _DOSEK_OS_OS_H_
#include "os/util/inline.h"
#include "os/helper.h"
diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index dd570c7..19fbd73 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -1,8 +1,8 @@
all:
- docker build -t dosek-base dosek-base
+ docker build -t danceos/dosek-base dosek-base
run:
- docker run --name dosek-base -d dosek-base
+ docker run --name dosek-base -d danceos/dosek-base
ssh:
ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no \
diff --git a/test/test.h b/test/test.h
index 3c424cc..05f959e 100644
--- a/test/test.h
+++ b/test/test.h
@@ -264,7 +264,7 @@ inlinehint void test_init(void) {
inlinehint void test_main(void)
{
debug.setcolor(Color::RED, Color::WHITE);
- debug << "CoRedOS start" << endl;
+ debug << "dOSEK start" << endl;
debug.setcolor(Color::YELLOW, Color::BLACK);
// prepare tests
@@ -278,7 +278,7 @@ inlinehint void test_main(void)
// halt system
debug.setcolor(Color::RED, Color::WHITE);
- debug << "CoRedOS halt" << endl;
+ debug << "dOSEK halt" << endl;
Machine::shutdown();
}
diff --git a/toolchain/ARM.cmake b/toolchain/ARM.cmake
index 52b855a..fd8934b 100644
--- a/toolchain/ARM.cmake
+++ b/toolchain/ARM.cmake
@@ -83,5 +83,5 @@ set(ISA_LD_FLAGS "${COMMON_ARM_FLAGS} -static -nostdlib -Qunused-arguments -Wl,-
# ENABLE ARM platform
set(BUILD_ARM "on" CACHE INTERNAL STRING)
-set(COREDOS_ARCHITECTURE "ARM")
+set(DOSEK_ARCHITECTURE "ARM")
diff --git a/toolchain/app.cmake b/toolchain/app.cmake
index e13e2d9..2959e94 100644
--- a/toolchain/app.cmake
+++ b/toolchain/app.cmake
@@ -2,34 +2,34 @@ include(CMakeParseArguments)
include(rtsc)
-MACRO(COREDOS_BINARY_EXECUTABLE NAME SOURCES SYSTEM_XML VERIFY_SCRIPT DEFINITIONS LIBS GENERATOR_ARGS)
- SET(COREDOS_ANNOTATE_SOURCE "${COREDOS_GENERATOR_DIR}/annotate/cored_annotate.cc")
- SET(COREDOS_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${NAME}")
- file(MAKE_DIRECTORY "${COREDOS_OUTPUT_DIR}")
- SET(COREDOS_ANNOTATE_OBJECT "${COREDOS_OUTPUT_DIR}/cored_annotate.ll")
+MACRO(DOSEK_BINARY_EXECUTABLE NAME SOURCES SYSTEM_XML VERIFY_SCRIPT DEFINITIONS LIBS GENERATOR_ARGS)
+ SET(DOSEK_ANNOTATE_SOURCE "${DOSEK_GENERATOR_DIR}/annotate/cored_annotate.cc")
+ SET(DOSEK_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/${NAME}")
+ file(MAKE_DIRECTORY "${DOSEK_OUTPUT_DIR}")
+ SET(DOSEK_ANNOTATE_OBJECT "${DOSEK_OUTPUT_DIR}/cored_annotate.ll")
# compile annotate file
set(ISA_CXX_FLAGS_LIST ${ISA_CXX_FLAGS})
separate_arguments(ISA_CXX_FLAGS_LIST)
- add_custom_command(OUTPUT ${COREDOS_ANNOTATE_OBJECT}
+ add_custom_command(OUTPUT ${DOSEK_ANNOTATE_OBJECT}
COMMAND ${CLANGPP_BINARY} -S -emit-llvm
- -I${COREDOS_GENERATOR_DIR}/annotate/
+ -I${DOSEK_GENERATOR_DIR}/annotate/
${ISA_CXX_FLAGS_LIST}
${INCLUDEDIRS_FLAGS}
-Wno-return-type
-std=c++11
- ${COREDOS_ANNOTATE_SOURCE} -o ${COREDOS_ANNOTATE_OBJECT}
- MAIN_DEPENDENCY ${COREDOS_ANNOTATE_SOURCE}
+ ${DOSEK_ANNOTATE_SOURCE} -o ${DOSEK_ANNOTATE_OBJECT}
+ MAIN_DEPENDENCY ${DOSEK_ANNOTATE_SOURCE}
COMMENT "[${PROJECT_NAME}/${name}] Compiling cored_annotate.c with clang")
- set(COREDOS_SOURCE_SYSTEM "${COREDOS_OUTPUT_DIR}/source_system.ll")
- set(COREDOS_RTSC_ANALYZE_XML "${COREDOS_OUTPUT_DIR}/rtsc_analyze.xml")
- set(COREDOS_GENERATED_SOURCE "${COREDOS_OUTPUT_DIR}/coredos.cc")
- set(COREDOS_GENERATED_LINKER "${COREDOS_OUTPUT_DIR}/linker.ld")
+ set(DOSEK_SOURCE_SYSTEM "${DOSEK_OUTPUT_DIR}/source_system.ll")
+ set(DOSEK_RTSC_ANALYZE_XML "${DOSEK_OUTPUT_DIR}/rtsc_analyze.xml")
+ set(DOSEK_GENERATED_SOURCE "${DOSEK_OUTPUT_DIR}/dosek.cc")
+ set(DOSEK_GENERATED_LINKER "${DOSEK_OUTPUT_DIR}/linker.ld")
- set(COREDOS_GENERATED_LLVM "${COREDOS_OUTPUT_DIR}/coredos.ll")
- set(COREDOS_BINARY_LLVM_BYTECODE "")
+ set(DOSEK_GENERATED_LLVM "${DOSEK_OUTPUT_DIR}/dosek.ll")
+ set(DOSEK_BINARY_LLVM_BYTECODE "")
set(DEFINITON_FLAGS ";")
foreach(DEF ${DEFINITIONS})
@@ -43,7 +43,7 @@ MACRO(COREDOS_BINARY_EXECUTABLE NAME SOURCES SYSTEM_XML VERIFY_SCRIPT DEFINITION
#COMMAND ${CLANGPP_BINARY} -S -emit-llvm -O0 -std=c++11 ${ISA_CXX_FLAGS_LIST} ${DEFINITON_FLAGS} ${INCLUDEDIRS_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/${src} -o ${llvm_bytecode}
foreach(src ${SOURCES})
- set(llvm_bytecode "${COREDOS_OUTPUT_DIR}/${src}.ll")
+ set(llvm_bytecode "${DOSEK_OUTPUT_DIR}/${src}.ll")
add_custom_command(OUTPUT ${llvm_bytecode}
COMMAND ${CMAKE_C_COMPILER}
ARGS ${COMPILER_FLAGS}
@@ -53,129 +53,129 @@ MACRO(COREDOS_BINARY_EXECUTABLE NAME SOURCES SYSTEM_XML VERIFY_SCRIPT DEFINITION
IMPLICIT_DEPENDS CXX ${CMAKE_CURRENT_SOURCE_DIR}/${src}
COMMENT "[${PROJECT_NAME}/${NAME}] Compiling application ${NAME}/${src} with clang")
- list(APPEND COREDOS_BINARY_LLVM_BYTECODE ${llvm_bytecode})
+ list(APPEND DOSEK_BINARY_LLVM_BYTECODE ${llvm_bytecode})
endforeach(src)
# # Use RTSC to analyze and merge the source system bytecode
- # add_custom_command(OUTPUT "${COREDOS_SOURCE_SYSTEM}"
- # DEPENDS ${COREDOS_ANNOTATE_OBJECT}
- # ${COREDOS_BINARY_LLVM_BYTECODE}
+ # add_custom_command(OUTPUT "${DOSEK_SOURCE_SYSTEM}"
+ # DEPENDS ${DOSEK_ANNOTATE_OBJECT}
+ # ${DOSEK_BINARY_LLVM_BYTECODE}
# ${CMAKE_CURRENT_SOURCE_DIR}/*.xml
# COMMAND ${EAG_BINARY} -data-deps=explicit -verify
- # -sysann=${COREDOS_ANNOTATE_OBJECT}
+ # -sysann=${DOSEK_ANNOTATE_OBJECT}
# -sourcesystem=${SYSTEM_XML}
- # -out=${COREDOS_OUTPUT_DIR}
+ # -out=${DOSEK_OUTPUT_DIR}
# -analyze-tasks -dump-source-system
# -dump-graphs
- # ${COREDOS_BINARY_LLVM_BYTECODE}
+ # ${DOSEK_BINARY_LLVM_BYTECODE}
# COMMENT "[${PROJECT_NAME}/${NAME}] Analyzing application with RTSC")
#
# # Add Target for the analysis step
# add_custom_target(${NAME}-rtsc-analyze
- # DEPENDS ${COREDOS_SOURCE_SYSTEM})
+ # DEPENDS ${DOSEK_SOURCE_SYSTEM})
# All python source files are a dependency
- SET(COREDOS_GENERATOR_ARGS "${GENERATOR_ARGS}")
- file(GLOB_RECURSE PYTHON_SOURCE "${COREDOS_GENERATOR_DIR}/*.py")
+ SET(DOSEK_GENERATOR_ARGS "${GENERATOR_ARGS}")
+ file(GLOB_RECURSE PYTHON_SOURCE "${DOSEK_GENERATOR_DIR}/*.py")
file(GLOB_RECURSE OS_TEMPLATES "${PROJECT_SOURCE_DIR}/os/*.in")
if(EXISTS "${VERIFY_SCRIPT}")
if (IS_DIRECTORY "${VERIFY_SCRIPT}")
SET(VERIFY_SCRIPT "")
else()
- SET(COREDOS_GENERATOR_ARGS ${COREDOS_GENERATOR_ARGS} --verify ${VERIFY_SCRIPT})
+ SET(DOSEK_GENERATOR_ARGS ${DOSEK_GENERATOR_ARGS} --verify ${VERIFY_SCRIPT})
endif()
else()
SET(VERIFY_SCRIPT "")
endif()
if(NOT ENCODED_SYSTEM)
- set(COREDOS_GENERATOR_ARGS ${COREDOS_GENERATOR_ARGS} --unencoded)
+ set(DOSEK_GENERATOR_ARGS ${DOSEK_GENERATOR_ARGS} --unencoded)
endif()
if(SPECIALIZE_SYSTEMCALLS)
- set(COREDOS_GENERATOR_ARGS ${COREDOS_GENERATOR_ARGS} --specialize-systemcalls)
+ set(DOSEK_GENERATOR_ARGS ${DOSEK_GENERATOR_ARGS} --specialize-systemcalls)
endif()
- # Generating COREDOS System
- add_custom_command(OUTPUT "${COREDOS_GENERATED_SOURCE}" "${COREDOS_GENERATED_LINKER}" "${COREDOS_SOURCE_SYSTEM}"
- DEPENDS ${PYTHON_SOURCE} "${SYSTEM_XML}" ${COREDOS_BINARY_LLVM_BYTECODE}
+ # Generating DOSEK System
+ add_custom_command(OUTPUT "${DOSEK_GENERATED_SOURCE}" "${DOSEK_GENERATED_LINKER}" "${DOSEK_SOURCE_SYSTEM}"
+ DEPENDS ${PYTHON_SOURCE} "${SYSTEM_XML}" ${DOSEK_BINARY_LLVM_BYTECODE}
${CMAKE_CURRENT_SOURCE_DIR}/*.xml
${VERIFY_SCRIPT} ${OS_TEMPLATES} ${LINKER_TEMPLATE}
- COMMAND ${CMAKE_COMMAND} -E remove -f ${COREDOS_OUTPUT_DIR}/gen_*.dot
- COMMAND ${COREDOS_GENERATOR}
+ COMMAND ${CMAKE_COMMAND} -E remove -f ${DOSEK_OUTPUT_DIR}/gen_*.dot
+ COMMAND ${DOSEK_GENERATOR}
--system-xml "${SYSTEM_XML}"
- --source-bytecode "${COREDOS_BINARY_LLVM_BYTECODE}"
- --merged-bytecode "${COREDOS_SOURCE_SYSTEM}"
- --prefix ${COREDOS_OUTPUT_DIR}
+ --source-bytecode "${DOSEK_BINARY_LLVM_BYTECODE}"
+ --merged-bytecode "${DOSEK_SOURCE_SYSTEM}"
+ --prefix ${DOSEK_OUTPUT_DIR}
--name ${NAME}
--template-base ${PROJECT_SOURCE_DIR}
- --arch ${COREDOS_ARCHITECTURE}
- ${COREDOS_GENERATOR_ARGS}
+ --arch ${DOSEK_ARCHITECTURE}
+ ${DOSEK_GENERATOR_ARGS}
COMMAND
- if [ x"$$EDIT" != x"" ]; then vim ${COREDOS_GENERATED_SOURCE}\; fi
- COMMENT "[${PROJECT_NAME}/${NAME}] Generating COREDOS source code"
+ if [ x"$$EDIT" != x"" ]; then vim ${DOSEK_GENERATED_SOURCE}\; fi
+ COMMENT "[${PROJECT_NAME}/${NAME}] Generating DOSEK source code"
)
- add_custom_target(${NAME}-generate DEPENDS "${COREDOS_GENERATED_SOURCE}")
+ add_custom_target(${NAME}-generate DEPENDS "${DOSEK_GENERATED_SOURCE}")
add_custom_target(${NAME}-clean
- COMMAND ${CMAKE_COMMAND} -E remove -f ${COREDOS_OUTPUT_DIR}/* ${COREDOS_BINARY_LLVM_BYTECODE}
+ COMMAND ${CMAKE_COMMAND} -E remove -f ${DOSEK_OUTPUT_DIR}/* ${DOSEK_BINARY_LLVM_BYTECODE}
)
set(APPTARGETS ${APPTARGETS} ${NAME} CACHE INTERNAL "application targets")
- # Since COREDOS_SOURCE_SYSTEM end in .ll the add_executable would
+ # Since DOSEK_SOURCE_SYSTEM end in .ll the add_executable would
# simply *silently* ignore the "object" file, by declaring it
# external it is passed on to the linker
SET_SOURCE_FILES_PROPERTIES(
- ${COREDOS_SOURCE_SYSTEM}
+ ${DOSEK_SOURCE_SYSTEM}
PROPERTIES
EXTERNAL_OBJECT true # to say that "this is actually an object file, so it should not be compiled, only linked"
GENERATED true # to say that "it is OK that the obj-files do not exist before build time"
)
- # Compile the coredos system
+ # Compile the dosek system
include_directories(${RTSC_SOURCE_DIR}/data/SystemSupport/CoReD/include/)
- coredos_executable(${NAME} EXCLUDE_FROM_ALL
- SOURCES ${COREDOS_SOURCE_SYSTEM} ${COREDOS_GENERATED_SOURCE}
- LIBS ${COREDOS_BINARY_LIBS}
+ dosek_executable(${NAME} EXCLUDE_FROM_ALL
+ SOURCES ${DOSEK_SOURCE_SYSTEM} ${DOSEK_GENERATED_SOURCE}
+ LIBS ${DOSEK_BINARY_LIBS}
DEFINITIONS ${DEFINITIONS}
- LINKER_SCRIPT ${COREDOS_GENERATED_LINKER}
+ LINKER_SCRIPT ${DOSEK_GENERATED_LINKER}
)
ENDMACRO()
-MACRO(COREDOS_BINARY)
+MACRO(DOSEK_BINARY)
set(options TEST_ISO FAIL)
set(oneValueArgs SYSTEM_XML NAME VERIFY)
set(multiValuedParameters SOURCES LIBS GENERATOR_ARGS)
- cmake_parse_arguments(COREDOS_BINARY "${options}" "${oneValueArgs}" "${multiValuedParameters}" ${ARGN} )
- set(COREDOS_BINARY_SOURCES "${COREDOS_BINARY_UNPARSED_ARGUMENTS};${COREDOS_BINARY_SOURCES}")
- SET(COREDOS_SYSTEM_XML "${CMAKE_CURRENT_SOURCE_DIR}/${COREDOS_BINARY_SYSTEM_XML}")
- set(COREDOS_VERIFY_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/${COREDOS_BINARY_VERIFY}")
- SET(NAME "${COREDOS_BINARY_NAME}")
+ cmake_parse_arguments(DOSEK_BINARY "${options}" "${oneValueArgs}" "${multiValuedParameters}" ${ARGN} )
+ set(DOSEK_BINARY_SOURCES "${DOSEK_BINARY_UNPARSED_ARGUMENTS};${DOSEK_BINARY_SOURCES}")
+ SET(DOSEK_SYSTEM_XML "${CMAKE_CURRENT_SOURCE_DIR}/${DOSEK_BINARY_SYSTEM_XML}")
+ set(DOSEK_VERIFY_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/${DOSEK_BINARY_VERIFY}")
+ SET(NAME "${DOSEK_BINARY_NAME}")
- COREDOS_BINARY_EXECUTABLE(${NAME} "${COREDOS_BINARY_SOURCES}" ${COREDOS_SYSTEM_XML} ${COREDOS_VERIFY_SCRIPT}
- "" "${COREDOS_BINARY_LIBS}" "${COREDOS_BINARY_GENERATOR_ARGS}")
+ DOSEK_BINARY_EXECUTABLE(${NAME} "${DOSEK_BINARY_SOURCES}" ${DOSEK_SYSTEM_XML} ${DOSEK_VERIFY_SCRIPT}
+ "" "${DOSEK_BINARY_LIBS}" "${DOSEK_BINARY_GENERATOR_ARGS}")
add_custom_command(TARGET ${NAME} POST_BUILD
COMMENT "Gathering binary statistics for ${NAME}"
- COMMAND ${COREDOS_GENERATOR_DIR}/stats_binary.py
- --stats-dict ${COREDOS_OUTPUT_DIR}/stats.dict.py
+ COMMAND ${DOSEK_GENERATOR_DIR}/stats_binary.py
+ --stats-dict ${DOSEK_OUTPUT_DIR}/stats.dict.py
--elf ${PROJECT_BINARY_DIR}/${NAME})
- if((${COREDOS_BINARY_FAIL} STREQUAL "TRUE") OR FAIL_TRACE_ALL)
- COREDOS_BINARY_EXECUTABLE(fail-${NAME} "${COREDOS_BINARY_SOURCES}" ${COREDOS_SYSTEM_XML} ${COREDOS_VERIFY_SCRIPT}
- "FAIL=1" "${COREDOS_BINARY_LIBS}" "${COREDOS_BINARY_GENERATOR_ARGS}")
+ if((${DOSEK_BINARY_FAIL} STREQUAL "TRUE") OR FAIL_TRACE_ALL)
+ DOSEK_BINARY_EXECUTABLE(fail-${NAME} "${DOSEK_BINARY_SOURCES}" ${DOSEK_SYSTEM_XML} ${DOSEK_VERIFY_SCRIPT}
+ "FAIL=1" "${DOSEK_BINARY_LIBS}" "${DOSEK_BINARY_GENERATOR_ARGS}")
fail_test(${NAME} fail-${NAME})
endif()
- if(${COREDOS_BINARY_TEST_ISO} STREQUAL "TRUE")
- coredos_add_test(${NAME} )
+ if(${DOSEK_BINARY_TEST_ISO} STREQUAL "TRUE")
+ dosek_add_test(${NAME} )
else()
# Add a compile testcase
add_test(test-${NAME} make ${NAME}-clean ${NAME})
endif()
-ENDMACRO(COREDOS_BINARY)
+ENDMACRO(DOSEK_BINARY)
diff --git a/toolchain/doxygen/CMakeLists.txt b/toolchain/doxygen/CMakeLists.txt
index cfc3ada..d774bdb 100644
--- a/toolchain/doxygen/CMakeLists.txt
+++ b/toolchain/doxygen/CMakeLists.txt
@@ -31,7 +31,7 @@ set(DOXYFILE ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
configure_file(Doxyfile.in ${DOXYFILE} @ONLY )
## call make doc to generate documentation
-set(line0 "[${PROJECT_NAME}] Generating CoRedOS documentation with Doxygen")
+set(line0 "[${PROJECT_NAME}] Generating dOSEK documentation with Doxygen")
set(line1 " Directories: ${DOXY_SOURCE}")
set(line2 " Excluded patterns: ${DOXY_EXCLUDE_PATTERNS}")
set(line3 " HTML output: ${DOXY_OUTPUT}/${DOXY_HTML_OUTPUT}")
diff --git a/toolchain/helpers.cmake b/toolchain/helpers.cmake
index 03637e5..bd7d248 100644
--- a/toolchain/helpers.cmake
+++ b/toolchain/helpers.cmake
@@ -3,7 +3,7 @@ set(INCLUDEDIRS "" CACHE INTERNAL "List of include dirs")
set(INCLUDEDIRS_FLAGS "" CACHE INTERNAL "List of include dirs (in flag form)")
-macro(coredos_include_dir IDIR)
+macro(dosek_include_dir IDIR)
set(INCLUDEDIRS ${INCLUDEDIRS} ${IDIR})
set(INCLUDEDIRS_FLAGS ${INCLUDEDIRS_FLAGS} -I${IDIR})
diff --git a/toolchain/i386.cmake b/toolchain/i386.cmake
index 17f3c3a..ae96129 100644
--- a/toolchain/i386.cmake
+++ b/toolchain/i386.cmake
@@ -71,4 +71,4 @@ set(LD_KERNEL_START_ADDRESS 0x100000 CACHE INTERNAL "Start address of the first
# ENABLE x86 32 platform
set(BUILD_i386 "on" CACHE INTERNAL STRING)
-set(COREDOS_ARCHITECTURE "i386")
+set(DOSEK_ARCHITECTURE "i386")
diff --git a/toolchain/llvm-link.py b/toolchain/llvm-link.py
index cd710dd..635f2d1 100755
--- a/toolchain/llvm-link.py
+++ b/toolchain/llvm-link.py
@@ -82,7 +82,7 @@ def start_ld(flags, objects, output):
if __name__ == "__main__":
import argparse
- parser = argparse.ArgumentParser(description='Linker for CoRedOS.')
+ parser = argparse.ArgumentParser(description='Linker for dOSEK.')
parser.add_argument("--output", "-o", metavar='OUT', help='The file to generate')
parser.add_argument("--linker-prefix", metavar='PREFIX', help='Output file prefix')
parser.add_argument("--llvm-dir", metavar='LLVM_DIR', help='Where are the llvm binaries located')
diff --git a/toolchain/posix.cmake b/toolchain/posix.cmake
index c76489a..c88aba9 100644
--- a/toolchain/posix.cmake
+++ b/toolchain/posix.cmake
@@ -32,7 +32,7 @@ set(LD_OUTPUT_FORMAT "elf32-i386" CACHE INTERNAL "LD output format for linker sc
# ENABLE posix platform
set(BUILD_posix "on" CACHE INTERNAL STRING)
-set(COREDOS_ARCHITECTURE "posix")
+set(DOSEK_ARCHITECTURE "posix")
--
GitLab