diff --git a/doc/logo.png b/doc/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..82b0f4ef666577aa0806fb1e11a5768e398cd757 Binary files /dev/null and b/doc/logo.png differ diff --git a/generator/attributor/main.cc b/generator/attributor/main.cc index 809fc90bf5232f9d3955657641649ec5ee313bd8..4b1cfefd93d7254cba80cbc77f5ebae393c1d7fb 100644 --- a/generator/attributor/main.cc +++ b/generator/attributor/main.cc @@ -14,7 +14,7 @@ #include <llvm/Config/llvm-config.h> -#if LLVM_VERSION_MAJOR >= 3 && LLVM_VERSION_MINOR >= 9 +#if LLVM_VERSION_MAJOR >= 3 && LLVM_VERSION_MINOR >= 8 #undef LLVM_LEGACY #else #define LLVM_LEGACY 1 diff --git a/generator/coder/os_generic.py b/generator/coder/os_generic.py index ede5c3d1b7f9bd346cc107550b9e4a7c1f866a1a..180016e1d3f576e51a1113bb78b2ba70d85a4395 100644 --- a/generator/coder/os_generic.py +++ b/generator/coder/os_generic.py @@ -114,6 +114,18 @@ class GenericOS(BaseCoder): extern_c = True) self.generator.source_file.data_manager.add(iddesc); + for res in self.system_graph.resources: + iddesc = DataObject("const ResourceType", "OSEKOS_RESOURCE_" + res.name, + static_initializer = str(res.conf.static_priority), + extern_c = True) + self.generator.source_file.data_manager.add(iddesc); + + for counter in self.system_graph.counters: + iddesc = DataObject("const CounterType", "OSEKOS_COUNTER_" + counter.conf.name, + static_initializer = "0", + extern_c = True) + self.generator.source_file.data_manager.add(iddesc); + events = {} for event in self.system_graph.events: event.impl = EventImpl() @@ -206,5 +218,3 @@ class GenericOS(BaseCoder): multiplexer.add("\t\treturn crc32(OS_all_CheckedObjects[arg0].location, OS_all_CheckedObjects[arg0].size);\n") multiplexer.add("\t}\n") self.generator.source_file.function_manager.add(multiplexer, "dep") - -