SystemC/SystemC-Components-Test
8
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

update latest version of SCC

Browse Source
This commit is contained in:
Eyck Jentzsch
2020-04-23 16:02:12 +02:00
parent 6103de7ae9
commit 7f096a7d87
14 changed files with 404 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/CMakeLists.txt
View File

@@ -15,7 +15,7 @@ include(Common)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
find_package(Threads)
find_package(SystemC REQUIRED)
find_package(OSCISystemC REQUIRED)
find_package(ZLIB)
if(SystemC_FOUND)
include_directories(${SystemC_INCLUDE_DIRS})

14
examples/simple_system/CMakeLists.txt
View File

@@ -13,11 +13,11 @@ add_executable (simple_system
# Link the executable to the sc_components library. Since the sc_components library has
# public include directories we will use those link directories when building
# simple_system
target_link_libraries (simple_system LINK_PUBLIC sc-components)
target_link_libraries (simple_system LINK_PUBLIC ${SystemC_LIBRARIES})
target_link_libraries (simple_system LINK_PUBLIC ${SCV_LIBRARIES})
target_link_libraries (simple_system LINK_PUBLIC scc)
#target_link_libraries (simple_system LINK_PUBLIC ${SystemC_LIBRARIES})
#target_link_libraries (simple_system LINK_PUBLIC ${SCV_LIBRARIES})
target_link_libraries (simple_system LINK_PUBLIC ${Boost_LIBRARIES} )
target_link_libraries (simple_system LINK_PUBLIC ${CONAN_LIBS_LEVELDB})
target_link_libraries (simple_system LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries (simple_system LINK_PUBLIC ${ZLIB_LIBRARY})
target_link_libraries (simple_system LINK_PUBLIC ${CMAKE_DL_LIBS})
#target_link_libraries (simple_system LINK_PUBLIC ${CONAN_LIBS_LEVELDB})
#target_link_libraries (simple_system LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT})
#target_link_libraries (simple_system LINK_PUBLIC ${ZLIB_LIBRARY})
#target_link_libraries (simple_system LINK_PUBLIC ${CMAKE_DL_LIBS})

5
examples/simple_system/sc_main.cpp
View File

@@ -39,11 +39,6 @@ const size_t ERROR_UNHANDLED_EXCEPTION = 2;
} // namespace
int sc_main(int argc, char *argv[]) {
///////////////////////////////////////////////////////////////////////////
// setup initial logging
/////////////////////////////////////////////////////////////////////////// LOGGER(DEFAULT)::reporting_level() = l;
LOGGER(DEFAULT)::reporting_level() = logging::INFO;
LOGGER(SystemC)::reporting_level() = logging::INFO;
///////////////////////////////////////////////////////////////////////////
// CLI argument parsing
///////////////////////////////////////////////////////////////////////////

14
examples/transaction_recording/CMakeLists.txt
View File

@@ -7,11 +7,9 @@ add_executable (transaction_recording
# Link the executable to the sc_components library. Since the sc_components library has
# public include directories we will use those link directories when building
# transaction_recording
target_link_libraries (transaction_recording LINK_PUBLIC sc-components)
target_link_libraries (transaction_recording LINK_PUBLIC ${SystemC_LIBRARIES})
target_link_libraries (transaction_recording LINK_PUBLIC ${SCV_LIBRARIES})
target_link_libraries (transaction_recording LINK_PUBLIC ${Boost_LIBRARIES} )
target_link_libraries (transaction_recording LINK_PUBLIC ${CONAN_LIBS_LEVELDB})
target_link_libraries (transaction_recording LINK_PUBLIC ${ZLIB_LIBRARIES} )
target_link_libraries (transaction_recording LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries (transaction_recording LINK_PUBLIC ${CMAKE_DL_LIBS})
target_link_libraries (transaction_recording LINK_PUBLIC scc)
#target_link_libraries (transaction_recording LINK_PUBLIC ${Boost_LIBRARIES} )
#target_link_libraries (transaction_recording LINK_PUBLIC ${CONAN_LIBS_LEVELDB})
#target_link_libraries (transaction_recording LINK_PUBLIC ${ZLIB_LIBRARIES} )
#target_link_libraries (transaction_recording LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT})
#target_link_libraries (transaction_recording LINK_PUBLIC ${CMAKE_DL_LIBS})

3
examples/transaction_recording/scv_tr_recording_example.cpp
View File

@@ -351,8 +351,7 @@ inline const char* init_db(char type){
int sc_main(int argc, char *argv[]) {
auto start = std::chrono::system_clock::now();
scv_startup();
scc::init_logging(logging::INFO);
LOGGER(SystemC)::print_time() = false;
scc::init_logging(scc::LogConfig().logLevel(logging::DEBUG));
const char *fileName = argc==2? init_db(argv[1][0]): "my_db.txlog";
if(argc<2) scv_tr_text_init();
scv_tr_db db(fileName);