VP
/
HIFIVE1-VP
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed C++11 compatibility

This commit is contained in:
Eyck Jentzsch 2019-07-16 15:54:15 +02:00
parent 255b379c20
commit c199db7bfd
9 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cproject
View File

@ -13,7 +13,7 @@
</extensions> </extensions>
</storageModule> </storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0"> <storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1751741082" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=" parent="cdt.managedbuild.config.gnu.exe.debug"> <configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.exe.debug.1751741082" name="Debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cdt.managedbuild.config.gnu.exe.debug">
<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1751741082." name="/" resourcePath=""> <folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1751741082." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1289745146" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug"> <toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1289745146" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
<targetPlatform binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.exe.debug.1460698591" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/> <targetPlatform binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.exe.debug.1460698591" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>

2
CMakeLists.txt
View File

@ -32,7 +32,7 @@ include(Conan)
#enable_testing() #enable_testing()
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON)

9
conanfile.txt
View File

@ -1,7 +1,8 @@
[requires] [requires]
gsl_microsoft/20180102@bincrafters/stable gsl_microsoft/20180102@bincrafters/stable
spdlog/0.16.3@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 Seasocks/1.3.2@minres/stable
SystemC/2.3.3@minres/stable SystemC/2.3.3@minres/stable
SystemCVerification/2.0.1@minres/stable SystemCVerification/2.0.1@minres/stable
@ -13,9 +14,9 @@
[options] [options]
Seasocks:shared=True Seasocks:shared=True
fmt:header_only=True fmt:header_only=True
SystemC:stdcxx=14 SystemC:stdcxx=11
SystemC:shared=True SystemC:shared=True
SystemCVerification:stdcxx=14 SystemCVerification:stdcxx=11
SystemCVerification:shared=True SystemCVerification:shared=True
SystemC-CCI:stdcxx=14 SystemC-CCI:stdcxx=11
SystemC-CCI:shared=True SystemC-CCI:shared=True

2
dbt-core

@ -1 +1 @@
Subproject commit 87ecbd4ae12a3a1adc24dd1d5cfee4889b1b5866 Subproject commit c1d65b863b34d2ff9d459d3caa4e6972213f2026

2
platform/incl/sysc/SiFive/gpio.h
View File

@ -69,7 +69,7 @@ protected:
void clock_cb(); void clock_cb();
void reset_cb(); void reset_cb();
void update_pins(uint32_t changed_bits); 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<sc_dt::sc_logic> &gp, sc_core::sc_time &delay); void pin_input(unsigned int tag, tlm::tlm_signal_gp<sc_dt::sc_logic> &gp, sc_core::sc_time &delay);
void forward_pin_input(unsigned int tag, tlm::tlm_signal_gp<sc_dt::sc_logic> &gp); void forward_pin_input(unsigned int tag, tlm::tlm_signal_gp<sc_dt::sc_logic> &gp);
void iof_input(unsigned int tag, unsigned iof_idx, tlm::tlm_signal_gp<> &gp, sc_core::sc_time &delay); void iof_input(unsigned int tag, unsigned iof_idx, tlm::tlm_signal_gp<> &gp, sc_core::sc_time &delay);

6
platform/incl/sysc/top/system.h
View File

@ -30,8 +30,8 @@
* *
*******************************************************************************/ *******************************************************************************/
#ifndef __SYSC_GENERAL_SYSTEM_H_ #ifndef __SYSC_TOP_SYSTEM_H_
#define __SYSC_GENERAL_SYSTEM_H_ #define __SYSC_TOP_SYSTEM_H_
#include "dcmotor.h" #include "dcmotor.h"
#include "h_bridge.h" #include "h_bridge.h"
@ -59,4 +59,4 @@ private:
void gen_por(); void gen_por();
}; };
} }
#endif /* __SYSC_GENERAL_SYSTEM_H_ */ #endif /* __SYSC_TOP_SYSTEM_H_ */

4
platform/src/sc_main.cpp
View File

@ -74,7 +74,7 @@ int sc_main(int argc, char *argv[]) {
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// set up infrastructure // set up infrastructure
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
iss::init_jit(argc, argv); iss::init_jit_debug(argc, argv);
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// set up configuration // set up configuration
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -90,7 +90,7 @@ int sc_main(int argc, char *argv[]) {
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// instantiate top level // instantiate top level
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
auto i_system = std::make_unique<sysc::system>("i_system"); auto i_system = scc::make_unique<sysc::system>("i_system");
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// add non-implemented 'enableTracing' properties // add non-implemented 'enableTracing' properties
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////

2
riscv

@ -1 +1 @@
Subproject commit 1947a2114f82498f8a2f5c2af7690d482f1e55a3 Subproject commit d037141d98951287215c4eee76a88e625433f331

2
scc

@ -1 +1 @@
Subproject commit 6558b1815baa8192f2dc6786611c76653272c136 Subproject commit 140a5a7067d9051cd15140f681428203843ced15