diff --git a/.gitignore b/.gitignore index 70c3057..a3c39fc 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ language.settings.xml /*.log /.gdbinit /*.out +/*.txlog diff --git a/README.md b/README.md index 26f7fc8..994f4c0 100644 --- a/README.md +++ b/README.md @@ -27,18 +27,16 @@ DBT-RISE-RiscV uses libGIS (https://github.com/vsergeev/libGIS) as well as ELFIO * you need to have a decent compiler, make, python, and cmake installed * install LLVM 4.0 according to http://apt.llvm.org/ (if it is not already provided by your distribution) -* install conan.io (see also http://docs.conan.io/en/latest/installation.html) +* install conan.io (see also http://docs.conan.io/en/latest/installation.html): ``` pip install conan ``` -* download and install SystemC from http://accellera.org/downloads/standards/systemc (this is going to be replaced with a conan.io integration) - * optionally download and install SystemC Verification Library (SCV) from Accelera into the same location -* setup conan to use the minres repo +* setup conan to use the minres repo: ``` - conan add remote minres https://dl.bintray.com/minres/conan-repo + conan add remote minres https://api.bintray.com/conan/minres/conan-repo ``` * checkout source from git -* start an out-of-source build like so (e.g. when using bash) +* start an out-of-source build: ``` cd DBT-RISE-RiscV mkdir build @@ -46,9 +44,6 @@ DBT-RISE-RiscV uses libGIS (https://github.com/vsergeev/libGIS) as well as ELFIO cmake .. cmake --build . ``` -* if the SystemC installation is not found by cmake you can optionally specify the location by either setting the following environment variables pointing to the installation - - SYSTEMC_HOME - - SYSTEMC_PREFIX * if you encounter issues when linking wrt. c++11 symbols you might have run into GCC ABI incompatibility introduced from GCC 5.0 onwards. You can fix this by adding '-s compiler.libcxx=libstdc++11' to the conan call or changing compiler.libcxx to ``` compiler.libcxx=libstdc++11 diff --git a/conanfile.txt b/conanfile.txt index 9505687..dc33bbc 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,10 +1,14 @@ [requires] Poco/1.7.8p3@pocoproject/stable -Seasocks/1.3.2@seasocks/stable +Seasocks/1.3.2@minres/stable +SystemC/2.3.2@minres/stable +SystemCVerification/2.0.0a@minres/stable [generators] cmake [options] Poco:shared=True -Seasocks:shared=False \ No newline at end of file +Seasocks:shared=False +SystemC:stdcxx=14 +SystemCVerification:stdcxx=14 \ No newline at end of file diff --git a/riscv.sc/src/CMakeLists.txt b/riscv.sc/src/CMakeLists.txt index ef3a5df..c708c19 100644 --- a/riscv.sc/src/CMakeLists.txt +++ b/riscv.sc/src/CMakeLists.txt @@ -41,6 +41,9 @@ target_link_libraries(${APPLICATION_NAME} external) target_link_libraries(${APPLICATION_NAME} ${llvm_libs}) target_link_libraries(${APPLICATION_NAME} ${SystemC_LIBRARIES} ) if(SCV_FOUND) + add_definitions(-DWITH_SCV) + include_directories(${SCV_INCLUDE_DIRS}) + link_directories(${SCV_LIBRARY_DIRS}) target_link_libraries (${APPLICATION_NAME} ${SCV_LIBRARIES}) endif() target_link_libraries(${APPLICATION_NAME} ${Boost_LIBRARIES} ) diff --git a/sc-components b/sc-components index d5abb72..30ebb87 160000 --- a/sc-components +++ b/sc-components @@ -1 +1 @@ -Subproject commit d5abb72bf3e9030e4a7800195cb6ea5e1bb218cc +Subproject commit 30ebb87f7683ebd65c7545e9dd341f1ccb1d26b5