From 9db8c39925f87f3465f54c2e958727aa82bf13e6 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Wed, 30 Jul 2025 05:56:41 +0200 Subject: [PATCH] fixes some settings and comments --- .clang-format | 2 +- .envrc | 4 +++- pysysc/tgc-vp-toplevel.py | 9 +++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.clang-format b/.clang-format index 48c14b9..a2683b8 100644 --- a/.clang-format +++ b/.clang-format @@ -38,7 +38,7 @@ BreakBeforeTernaryOperators: true BreakConstructorInitializersBeforeComma: true BreakAfterJavaFieldAnnotations: false BreakStringLiterals: true -ColumnLimit: 120 +ColumnLimit: 140 CommentPragmas: '^( IWYU pragma:| @suppress)' ConstructorInitializerAllOnOneLineOrOnePerLine: false ConstructorInitializerIndentWidth: 0 diff --git a/.envrc b/.envrc index bcdccba..032d31f 100644 --- a/.envrc +++ b/.envrc @@ -6,6 +6,8 @@ if [ $distro == "CentOS" ]; then elif [ $distro == "Rocky" ]; then . /opt/rh/gcc-toolset-11/enable fi -module load ./Modulefile +if has module; then + module load ./Modulefile +fi layout python3 [ -f .envrc.$USER ] && . .envrc.$USER diff --git a/pysysc/tgc-vp-toplevel.py b/pysysc/tgc-vp-toplevel.py index b1a3b9f..bf8bee0 100755 --- a/pysysc/tgc-vp-toplevel.py +++ b/pysysc/tgc-vp-toplevel.py @@ -33,17 +33,18 @@ pysysc.load_systemc() ############################################################################### scc.load_lib(project_dir) ############################################################################### -logging.debug("Loading TGC-VP Peripherals libs") +logging.debug("Loading RISCV-VP Peripherals libs") pysysc.add_include_path(os.path.join(project_dir, 'vpvper')) pysysc.add_library('sifive.h', 'libvpvper_sifive.so', project_dir) +pysysc.add_library('sifive.h', 'libvpvper_minres.so', project_dir) ############################################################################### logging.debug("Loading TGC-ISS") -pysysc.add_include_path(os.path.join(project_dir, 'tgc-iss/dbt-rise-tgc/incl/sysc')) -pysysc.add_library('core_complex.h', 'libdbt-rise-tgc_sc.so', project_dir) +pysysc.add_include_path(os.path.join(project_dir, 'iss/dbt-rise-riscv/incl/sysc')) +pysysc.add_library('core_complex.h', 'libdbt-rise-riscv.so', project_dir) ############################################################################### # Include section ############################################################################### -cppyy.include(os.path.join(project_dir, 'src/tgfs_vp/rst_gen.h')) +cppyy.include(os.path.join(project_dir, 'src/vp/rst_gen.h')) ############################################################################### # configure ###############################################################################