diff --git a/.cproject b/.cproject index 33377f1..42903f2 100644 --- a/.cproject +++ b/.cproject @@ -20,12 +20,12 @@ - + - + @@ -39,11 +39,11 @@ - + - + @@ -96,7 +96,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -125,7 +125,7 @@ - + diff --git a/.project b/.project index 48a6ba2..1122279 100644 --- a/.project +++ b/.project @@ -24,4 +24,22 @@ org.eclipse.cdt.managedbuilder.core.managedBuildNature org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + + sysc_src + 2 + /home/eyck/.conan/data/SystemC/2.3.2/minres/stable/source/systemc-2.3.2/src + + + + + 1530629211275 + sysc_src + 22 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-*.h + + + diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index f872b00..1de6284 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,8 +5,7 @@ - - + @@ -17,7 +16,7 @@ - + diff --git a/CMakeLists.txt b/CMakeLists.txt index a892301..0bdc279 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ setup_conan() # This line finds the boost lib and headers. set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install. -find_package(Boost COMPONENTS program_options system thread REQUIRED) +find_package(Boost COMPONENTS program_options filesystem system thread REQUIRED) # set-up SystemC and SCV find_package(SystemC) diff --git a/conanfile.txt b/conanfile.txt index b57a63b..90d461a 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -3,7 +3,7 @@ spdlog/0.16.3@bincrafters/stable SystemC/2.3.2@minres/stable SystemCVerification/2.0.1@minres/stable - SystemC-CCI/0.9.0@minres/stable + SystemC-CCI/1.0.0@minres/stable [generators] cmake diff --git a/etc/simple_system.launch b/etc/simple_system.launch index a3c9e5d..0dd0585 100644 --- a/etc/simple_system.launch +++ b/etc/simple_system.launch @@ -1,9 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + - + @@ -16,5 +39,6 @@ + diff --git a/examples/simple_system/gpio.cpp b/examples/simple_system/gpio.cpp index c0ca85f..04e847e 100644 --- a/examples/simple_system/gpio.cpp +++ b/examples/simple_system/gpio.cpp @@ -25,6 +25,8 @@ gpio::gpio(sc_core::sc_module_name nm) , tlm_target<>(clk) , NAMED(clk_i) , NAMED(rst_i) +, NAMED(out, 32) +, NAMED(in, 32) , NAMEDD(gpio_regs, regs) { regs->registerResources(*this); SC_METHOD(clock_cb); diff --git a/examples/simple_system/gpio.h b/examples/simple_system/gpio.h index a289abe..1e9b2d3 100644 --- a/examples/simple_system/gpio.h +++ b/examples/simple_system/gpio.h @@ -18,6 +18,7 @@ #define _GPIO_H_ #include +#include namespace sysc { @@ -28,6 +29,8 @@ public: SC_HAS_PROCESS(gpio); sc_core::sc_in clk_i; sc_core::sc_in rst_i; + sc_core::sc_vector> out; + sc_core::sc_vector> in; gpio(sc_core::sc_module_name nm); virtual ~gpio(); diff --git a/examples/simple_system/sc_main.cpp b/examples/simple_system/sc_main.cpp index 33141d4..1bda3c6 100644 --- a/examples/simple_system/sc_main.cpp +++ b/examples/simple_system/sc_main.cpp @@ -76,7 +76,7 @@ int sc_main(int argc, char *argv[]) { /////////////////////////////////////////////////////////////////////////// // set up tracing & transaction recording /////////////////////////////////////////////////////////////////////////// - tracer trace("simple_system", tracer::TEXT, vm.count("trace")); + tracer trace("simple_system", tracer::BINARY, vm.count("trace")); // todo: fix displayed clock period in VCD /////////////////////////////////////////////////////////////////////////// diff --git a/examples/simple_system/simple_system.cpp b/examples/simple_system/simple_system.cpp index 158f845..083b787 100644 --- a/examples/simple_system/simple_system.cpp +++ b/examples/simple_system/simple_system.cpp @@ -66,6 +66,7 @@ simple_system::simple_system(sc_core::sc_module_name nm) i_master.global_interrupts_o(s_global_interrupts); i_master.core_interrupt_i(s_core_interrupt); + i_gpio.in(i_gpio.out); SC_THREAD(gen_reset); } diff --git a/examples/transaction_recording/CMakeLists.txt b/examples/transaction_recording/CMakeLists.txt index bfcbd5a..aa1d8ba 100644 --- a/examples/transaction_recording/CMakeLists.txt +++ b/examples/transaction_recording/CMakeLists.txt @@ -10,5 +10,6 @@ add_executable (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 ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries (transaction_recording LINK_PUBLIC ${CMAKE_DL_LIBS}) diff --git a/examples/transaction_recording/scv_tr_recording_example.cpp b/examples/transaction_recording/scv_tr_recording_example.cpp index 7a5c18d..6e2e571 100644 --- a/examples/transaction_recording/scv_tr_recording_example.cpp +++ b/examples/transaction_recording/scv_tr_recording_example.cpp @@ -324,7 +324,7 @@ inline void design::data_phase() { outstandingType.pop_front(); } } -extern void scv_tr_sqlite_init(); +extern void scv_tr_binary_init(); int sc_main(int argc, char *argv[]) { scv_startup(); @@ -333,7 +333,7 @@ int sc_main(int argc, char *argv[]) { scv_tr_text_init(); const char* fileName = "my_db.txlog"; #else - scv_tr_sqlite_init(); + scv_tr_binary_init(); const char *fileName = "my_db"; #endif scv_tr_db db(fileName); diff --git a/sc-components b/sc-components index bab66d1..3bf292c 160000 --- a/sc-components +++ b/sc-components @@ -1 +1 @@ -Subproject commit bab66d1744221fdce7d0634c08c5c21184539d2a +Subproject commit 3bf292cae272e0cbe3ed84a25a843948a85e2ca1