From c199db7bfd937f0af95c9e88418f2aceafa11d12 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Tue, 16 Jul 2019 15:54:15 +0200 Subject: [PATCH] Fixed C++11 compatibility --- .cproject | 2 +- CMakeLists.txt | 2 +- conanfile.txt | 9 +++++---- dbt-core | 2 +- platform/incl/sysc/SiFive/gpio.h | 2 +- platform/incl/sysc/top/system.h | 6 +++--- platform/src/sc_main.cpp | 4 ++-- riscv | 2 +- scc | 2 +- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.cproject b/.cproject index 11e351d..69c22d9 100644 --- a/.cproject +++ b/.cproject @@ -13,7 +13,7 @@ - + diff --git a/CMakeLists.txt b/CMakeLists.txt index e1d3d08..b67b0bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ include(Conan) #enable_testing() -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_POSITION_INDEPENDENT_CODE ON) diff --git a/conanfile.txt b/conanfile.txt index 02bde10..6cffc7e 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,7 +1,8 @@ [requires] gsl_microsoft/20180102@bincrafters/stable spdlog/0.16.3@bincrafters/stable - fmt/5.2.1@bincrafters/stable + #fmt/5.2.1@bincrafters/stable + fmt/4.1.0@bincrafters/stable Seasocks/1.3.2@minres/stable SystemC/2.3.3@minres/stable SystemCVerification/2.0.1@minres/stable @@ -13,9 +14,9 @@ [options] Seasocks:shared=True fmt:header_only=True - SystemC:stdcxx=14 + SystemC:stdcxx=11 SystemC:shared=True - SystemCVerification:stdcxx=14 + SystemCVerification:stdcxx=11 SystemCVerification:shared=True - SystemC-CCI:stdcxx=14 + SystemC-CCI:stdcxx=11 SystemC-CCI:shared=True diff --git a/dbt-core b/dbt-core index 87ecbd4..c1d65b8 160000 --- a/dbt-core +++ b/dbt-core @@ -1 +1 @@ -Subproject commit 87ecbd4ae12a3a1adc24dd1d5cfee4889b1b5866 +Subproject commit c1d65b863b34d2ff9d459d3caa4e6972213f2026 diff --git a/platform/incl/sysc/SiFive/gpio.h b/platform/incl/sysc/SiFive/gpio.h index ccac42f..8e1c96e 100644 --- a/platform/incl/sysc/SiFive/gpio.h +++ b/platform/incl/sysc/SiFive/gpio.h @@ -69,7 +69,7 @@ protected: void clock_cb(); void reset_cb(); void update_pins(uint32_t changed_bits); - void before_end_of_elaboration(); + void before_end_of_elaboration() override; void pin_input(unsigned int tag, tlm::tlm_signal_gp &gp, sc_core::sc_time &delay); void forward_pin_input(unsigned int tag, tlm::tlm_signal_gp &gp); void iof_input(unsigned int tag, unsigned iof_idx, tlm::tlm_signal_gp<> &gp, sc_core::sc_time &delay); diff --git a/platform/incl/sysc/top/system.h b/platform/incl/sysc/top/system.h index 3d60001..d8c7b7c 100644 --- a/platform/incl/sysc/top/system.h +++ b/platform/incl/sysc/top/system.h @@ -30,8 +30,8 @@ * *******************************************************************************/ -#ifndef __SYSC_GENERAL_SYSTEM_H_ -#define __SYSC_GENERAL_SYSTEM_H_ +#ifndef __SYSC_TOP_SYSTEM_H_ +#define __SYSC_TOP_SYSTEM_H_ #include "dcmotor.h" #include "h_bridge.h" @@ -59,4 +59,4 @@ private: void gen_por(); }; } -#endif /* __SYSC_GENERAL_SYSTEM_H_ */ +#endif /* __SYSC_TOP_SYSTEM_H_ */ diff --git a/platform/src/sc_main.cpp b/platform/src/sc_main.cpp index 24a9b67..89938e9 100644 --- a/platform/src/sc_main.cpp +++ b/platform/src/sc_main.cpp @@ -74,7 +74,7 @@ int sc_main(int argc, char *argv[]) { /////////////////////////////////////////////////////////////////////////// // set up infrastructure /////////////////////////////////////////////////////////////////////////// - iss::init_jit(argc, argv); + iss::init_jit_debug(argc, argv); /////////////////////////////////////////////////////////////////////////// // set up configuration /////////////////////////////////////////////////////////////////////////// @@ -90,7 +90,7 @@ int sc_main(int argc, char *argv[]) { /////////////////////////////////////////////////////////////////////////// // instantiate top level /////////////////////////////////////////////////////////////////////////// - auto i_system = std::make_unique("i_system"); + auto i_system = scc::make_unique("i_system"); /////////////////////////////////////////////////////////////////////////// // add non-implemented 'enableTracing' properties /////////////////////////////////////////////////////////////////////////// diff --git a/riscv b/riscv index 1947a21..d037141 160000 --- a/riscv +++ b/riscv @@ -1 +1 @@ -Subproject commit 1947a2114f82498f8a2f5c2af7690d482f1e55a3 +Subproject commit d037141d98951287215c4eee76a88e625433f331 diff --git a/scc b/scc index 6558b18..140a5a7 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit 6558b1815baa8192f2dc6786611c76653272c136 +Subproject commit 140a5a7067d9051cd15140f681428203843ced15