diff --git a/.gitignore b/.gitignore index 40e5fa7..cec994f 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ CMakeSettings.json /src-gen/ /*.json /cfg.yaml +/.direnv +/.cache \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 26c587c..18fdf26 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,7 +4,7 @@ { "label": "CMake-and-make", "type": "shell", - "command": "source /workspace/venv/bin/activate && cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON && cmake --build build", + "command": "source .venv/bin/activate && cmake -B build -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON && cmake --build build", "problemMatcher": [], "presentation": { "echo": true, diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..ec2cd9c --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +conan<2.0 \ No newline at end of file diff --git a/test_gen/PipelinedMemoryBusToApbBridge.h b/test_gen/PipelinedMemoryBusToApbBridge.h new file mode 100644 index 0000000..c7954fd --- /dev/null +++ b/test_gen/PipelinedMemoryBusToApbBridge.h @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2023 MINRES Technologies GmbH + * + * SPDX-License-Identifier: Apache-2.0 + * + * Created on: «new Date» + * * «componentDefinition.effectiveName».h Author: + * +*/ + +#pragma once + +// need double braces, see https://stackoverflow.com/questions/6893700/how-to-construct-stdarray-object-with-initializer-list#6894191 +const std::array, 7> PipelinedMemoryBusToApbBridge_map = {{ + { gpio0.socket, 0x0, 0xc }, + { uart0.socket, 0x1000, 0x14 }, + { timer0.socket, 0x20000, 0x1c }, + { aclint.socket, 0x30000, 0xc000 }, + { irq_ctrl.socket, 0x40000, 0x8 }, + { qspi.socket, 0x50000, 0x5c }, + { bootloader.socket, 0x80000, 0x400 }, + }} ; \ No newline at end of file diff --git a/vpvper b/vpvper index 0b2dba5..2a3ec57 160000 --- a/vpvper +++ b/vpvper @@ -1 +1 @@ -Subproject commit 0b2dba5820ac06821306121f1d80b6b077fda4da +Subproject commit 2a3ec57906b8c5a1ab1cb146f214fe0b19aed564