diff --git a/.cproject b/.cproject index 82a9744..e15113a 100644 --- a/.cproject +++ b/.cproject @@ -1,296 +1,161 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CMAKE_BUILD_TOOL + $<cmake4eclipse_dyn> + test + true + true + true + + + + \ No newline at end of file diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index a6b251d..2790956 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -1,54 +1,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 0868b82..1d09b85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.12) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/sc-components/cmake) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/scc/cmake) project(SCC_Test) @@ -10,10 +10,10 @@ set(ENABLE_SHARED TRUE CACHE BOOL "Build shared libraries") set(NO_SUBMODULE_CHECK FALSE CACHE BOOL "Disable the submodule check") include(GitFunctions) -get_branch_from_git() +get_info_from_git() ### set the directory names of the submodules -set(GIT_SUBMODULES sc-components) +set(GIT_SUBMODULES scc) set(GIT_SUBMODULE_DIR_sc-components .) ### set each submodules's commit or tag that is to be checked out ### (leave empty if you want master) @@ -53,7 +53,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") set(warnings "/W4 /WX /EHsc") endif() -setup_conan() +setup_conan(TARGETS) # 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. @@ -65,7 +65,7 @@ if(NOT SystemC_FOUND) message( FATAL_ERROR "SystemC library not found." ) endif() -add_subdirectory(sc-components) +add_subdirectory(scc) add_subdirectory(examples) add_subdirectory(tests) diff --git a/Modulefile b/Modulefile new file mode 100644 index 0000000..aea43b5 --- /dev/null +++ b/Modulefile @@ -0,0 +1,16 @@ +#%Module###################################################################### +## +## Project Module +## +proc ModulesHelp { } { + puts stderr "\tThe SCC Tests Project Module\n" + puts stderr "\tThis module loads PATHs and variables for SCC tests." +} + +set distro [exec /bin/lsb_release -i -s] +if { $distro == "CentOS" && ![info exists ::env(PROJECT)] && ![info exists ::env(PCP_DIR)] } { + puts stderr "Don't forget to execute 'scl enable devtoolset-7 llvm-toolset-7 bash'" +} + +module load tools/cmake + diff --git a/cmake/Common.cmake b/cmake/Common.cmake deleted file mode 100644 index 673ec59..0000000 --- a/cmake/Common.cmake +++ /dev/null @@ -1,20 +0,0 @@ -# Function to link between sub-projects -function(add_dependent_subproject subproject_name) - #if (NOT TARGET ${subproject_name}) # target unknown - if(NOT PROJECT_${subproject_name}) # var unknown because we build only this subproject - find_package(${subproject_name} CONFIG REQUIRED) - else () # we know the target thus we are doing a build from the top directory - include_directories(../${subproject_name}/incl) - endif () -endfunction(add_dependent_subproject) - -# Make sure we tell the topdir CMakeLists that we exist (if build from topdir) -get_directory_property(hasParent PARENT_DIRECTORY) -if(hasParent) - set(PROJECT_${PROJECT_NAME} true PARENT_SCOPE) -endif() - -# Function to link between sub-projects -function(add_dependent_header subproject_name) - include_directories(../${subproject_name}/incl) -endfunction(add_dependent_header) diff --git a/cmake/Conan.cmake b/cmake/Conan.cmake deleted file mode 100644 index 946ccb9..0000000 --- a/cmake/Conan.cmake +++ /dev/null @@ -1,45 +0,0 @@ -macro(setup_conan) - find_program(conan conan PATHS /usr/bin /usr/local/bin) - if(NOT EXISTS ${conan}) - message(FATAL_ERROR "Conan is required. Please see README.md") - return() - endif() - - if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL Darwin) - set(os Macos) - else() - set(os ${CMAKE_HOST_SYSTEM_NAME}) - endif() - - if(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) - set(compiler gcc) - elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL AppleClang) - set(compiler apple-clang) - else() - message(FATAL_ERROR "Unknown compiler: ${CMAKE_CXX_COMPILER_ID}") - endif() - - string(SUBSTRING ${CMAKE_CXX_COMPILER_VERSION} 0 3 compiler_version) - - set(conanfile ${CMAKE_SOURCE_DIR}/conanfile.txt) - set(conanfile_cmake ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) - set(compiler_libcxx libstdc++11) - - if("${CMAKE_BUILD_TYPE}" STREQUAL "") - set(CONAN_BUILD_TYPE Debug) - elseif("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo") - set(CONAN_BUILD_TYPE Release) - else() - set(CONAN_BUILD_TYPE ${CMAKE_BUILD_TYPE}) - endif() - - execute_process(COMMAND ${conan} install --build=missing - -s build_type=${CONAN_BUILD_TYPE} -s compiler.libcxx=${compiler_libcxx} - ${CMAKE_SOURCE_DIR} RESULT_VARIABLE return_code) - if(NOT ${return_code} EQUAL 0) - message(FATAL_ERROR "conan install command failed.") - endif() - - include(${conanfile_cmake}) - conan_basic_setup() -endmacro() diff --git a/cmake/DoxygenTarget.cmake b/cmake/DoxygenTarget.cmake deleted file mode 100644 index 49d5dd4..0000000 --- a/cmake/DoxygenTarget.cmake +++ /dev/null @@ -1,24 +0,0 @@ -function(PrepareDocTarget) - - # Configure the doxygen config file with current settings: - configure_file(documentation-config.doxygen.in ${CMAKE_CURRENT_BINARY_DIR}/documentation-config.doxygen @ONLY) - - # Set the name of the target : "doc" if it doesn't already exist and "doc" if it does. - # This way we make sure to have a single "doc" target. Either it is the one of the top directory or - # it is the one of the subproject that we are compiling alone. - set(DOC_TARGET_NAME "doc") - if(TARGET doc) - set(DOC_TARGET_NAME "doc${PROJECT_NAME}") - endif() - - add_custom_target(${DOC_TARGET_NAME} ${TARGET_ALL} - ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/documentation-config.doxygen - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Generating API documentation using doxygen for ${PROJECT_NAME}" VERBATIM) - - set(INSTALL_DOC_DIR ${CMAKE_BINARY_DIR}/doc/${PROJECT_NAME}/html) - file(MAKE_DIRECTORY ${INSTALL_DOC_DIR}) # needed for install - - install(DIRECTORY ${INSTALL_DOC_DIR} DESTINATION share/${PROJECT_NAME}-${VERSION_MAJOR} COMPONENT doc) - -endfunction() \ No newline at end of file diff --git a/cmake/GitFunctions.cmake b/cmake/GitFunctions.cmake deleted file mode 100644 index bbb4903..0000000 --- a/cmake/GitFunctions.cmake +++ /dev/null @@ -1,22 +0,0 @@ -if(__git_functions) - return() -endif() -set(__git_functions YES) - -function( get_branch_from_git ) - execute_process( - COMMAND git rev-parse --abbrev-ref HEAD - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - RESULT_VARIABLE git_result - OUTPUT_VARIABLE git_branch - ERROR_VARIABLE git_error - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE - ) - if( NOT git_result EQUAL 0 ) - message( FATAL_ERROR "Failed to execute Git: ${git_error}" ) - endif() - - set( GIT_BRANCH ${git_branch} PARENT_SCOPE ) -endfunction( get_branch_from_git ) - diff --git a/conanfile.txt b/conanfile.txt index 31b07b3..9e85b22 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,14 +1,13 @@ [requires] - gsl_microsoft/20180102@bincrafters/stable fmt/6.1.2 - SystemCVerification/2.0.1@minres/stable - SystemC-CCI/1.0.0@minres/stable + boost/1.75.0 + gsl-lite/0.37.0 + systemc/2.3.3 + #systemc-scv/2.0.1 + systemc-cci/1.0.0 [generators] cmake - txt [options] fmt:header_only=True - SystemCVerification:stdcxx=11 - SystemC-CCI:stdcxx=11 \ No newline at end of file diff --git a/examples/ahb_bfm/CMakeLists.txt b/examples/ahb_bfm/CMakeLists.txt index 88306ee..26a00a3 100644 --- a/examples/ahb_bfm/CMakeLists.txt +++ b/examples/ahb_bfm/CMakeLists.txt @@ -7,4 +7,4 @@ add_executable (ahb_bfm # 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 (ahb_bfm LINK_PUBLIC scc ${CONAN_LIBS}) +target_link_libraries (ahb_bfm LINK_PUBLIC scc) diff --git a/examples/ahb_bfm/sc_main.cpp b/examples/ahb_bfm/sc_main.cpp index c8129a3..8bc1063 100644 --- a/examples/ahb_bfm/sc_main.cpp +++ b/examples/ahb_bfm/sc_main.cpp @@ -1,16 +1,14 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include #include #include -#include #include -#include +#include using namespace sc_core; using namespace scc; @@ -18,8 +16,8 @@ using namespace scc; class testbench: public sc_module, public scc::traceable { public: enum { WIDTH=64}; - scc::initiator_mixin> isck{"isck"}; - tlm::ahb::bfm::initiator intor{"intor"}; + tlm::scc::initiator_mixin> isck{"isck"}; + ahb::bfm::initiator intor{"intor"}; sc_core::sc_clock HCLK{"HCLK", 10_ns}; sc_core::sc_signal HRESETn{"HRESETn"}; sc_core::sc_signal> HADDR{"HADDR"}; @@ -35,8 +33,8 @@ public: sc_core::sc_signal HRESP{"HRESP"}; sc_core::sc_signal HSEL{"HSEL"}; - tlm::ahb::bfm::target target{"target"}; - scc::target_mixin> tsck{"tsck"}; + ahb::bfm::target target{"target"}; + tlm::scc::target_mixin> tsck{"tsck"}; testbench(sc_module_name nm):sc_module(nm){ SC_HAS_PROCESS(testbench); @@ -117,7 +115,7 @@ int sc_main (int argc , char *argv[]){ /////////////////////////////////////////////////////////////////////////// // configure logging /////////////////////////////////////////////////////////////////////////// - scc::init_logging(logging::DEBUG); + scc::init_logging(scc::log::DEBUG); /////////////////////////////////////////////////////////////////////////// // set up configuration and tracing /////////////////////////////////////////////////////////////////////////// diff --git a/examples/simple_system/gpio.cpp b/examples/simple_system/gpio.cpp index 041f505..7c40e6d 100644 --- a/examples/simple_system/gpio.cpp +++ b/examples/simple_system/gpio.cpp @@ -63,7 +63,7 @@ gpio::gpio(sc_module_name nm) SC_METHOD(reset_cb); sensitive << rst_i; dont_initialize(); - auto pins_i_cb =[this](unsigned int tag, tlm::tlm_signal_gp<>& gp, + auto pins_i_cb =[this](unsigned int tag, tlm::scc::tlm_signal_gp<>& gp, tlm::tlm_phase& phase, sc_time& delay)->tlm::tlm_sync_enum{ this->pin_input(tag, gp, delay); return tlm::TLM_COMPLETED; @@ -73,7 +73,7 @@ gpio::gpio(sc_module_name nm) s.register_nb_transport(pins_i_cb, i); ++i; } - auto iof0_i_cb =[this](unsigned int tag, tlm::tlm_signal_gp<>& gp, + auto iof0_i_cb =[this](unsigned int tag, tlm::scc::tlm_signal_gp<>& gp, tlm::tlm_phase& phase, sc_time& delay)->tlm::tlm_sync_enum{ last_iof0[tag]=gp.get_value(); this->iof_input(tag, 0, gp, delay); @@ -84,7 +84,7 @@ gpio::gpio(sc_module_name nm) s.register_nb_transport(iof0_i_cb, i); ++i; } - auto iof1_i_cb =[this](unsigned int tag, tlm::tlm_signal_gp<>& gp, + auto iof1_i_cb =[this](unsigned int tag, tlm::scc::tlm_signal_gp<>& gp, tlm::tlm_phase& phase, sc_time& delay)->tlm::tlm_sync_enum{ last_iof1[tag]=gp.get_value(); this->iof_input(tag, 1, gp, delay); @@ -125,7 +125,7 @@ void gpio::clock_cb() { this->clk = clk_i.read(); } -tlm::tlm_phase gpio::write_output(tlm::tlm_signal_gp& gp, size_t i, bool val) { +tlm::tlm_phase gpio::write_output(tlm::scc::tlm_signal_gp& gp, size_t i, bool val) { sc_time delay{SC_ZERO_TIME}; tlm::tlm_phase phase{ tlm::BEGIN_REQ }; gp.set_command(tlm::TLM_WRITE_COMMAND); @@ -137,7 +137,7 @@ tlm::tlm_phase gpio::write_output(tlm::tlm_signal_gp& gp, size_t i, bool v void gpio::update_pins(uint32_t changed_bits) { sc_inout_rv<32>::data_type out_val; - tlm::tlm_signal_gp gp; + tlm::scc::tlm_signal_gp gp; bool val; for(size_t i=0, mask = 1; i<32; ++i, mask<<=1){ if(changed_bits&mask){ @@ -159,7 +159,7 @@ void gpio::update_pins(uint32_t changed_bits) { } } -void gpio::pin_input(unsigned int tag, tlm::tlm_signal_gp& gp, sc_time& delay) { +void gpio::pin_input(unsigned int tag, tlm::scc::tlm_signal_gp& gp, sc_time& delay) { if(delay>SC_ZERO_TIME){ wait(delay); delay=SC_ZERO_TIME; @@ -178,11 +178,11 @@ void gpio::pin_input(unsigned int tag, tlm::tlm_signal_gp& gp, sc_time& de } } -void gpio::forward_pin_input(unsigned int tag, tlm::tlm_signal_gp& gp) { +void gpio::forward_pin_input(unsigned int tag, tlm::scc::tlm_signal_gp& gp) { const auto mask = 1U<iof_en&mask){ auto& socket = regs->iof_sel&mask?iof1_o[tag]:iof0_o[tag]; - tlm::tlm_signal_gp<> new_gp; + tlm::scc::tlm_signal_gp<> new_gp; for(size_t i=0; i& gp) { } } -void gpio::iof_input(unsigned int tag, unsigned iof_idx, tlm::tlm_signal_gp<>& gp, sc_time& delay) { +void gpio::iof_input(unsigned int tag, unsigned iof_idx, tlm::scc::tlm_signal_gp<>& gp, sc_time& delay) { if(delay>SC_ZERO_TIME){ wait(delay); delay=SC_ZERO_TIME; @@ -208,7 +208,7 @@ void gpio::iof_input(unsigned int tag, unsigned iof_idx, tlm::tlm_signal_gp<>& g for(size_t i=0; i new_gp; + tlm::scc::tlm_signal_gp<> new_gp; new_gp.set_command(tlm::TLM_WRITE_COMMAND); auto val = gp.get_value(); new_gp.set_value(val); diff --git a/examples/simple_system/gpio.h b/examples/simple_system/gpio.h index d61b9a6..3c1c97e 100644 --- a/examples/simple_system/gpio.h +++ b/examples/simple_system/gpio.h @@ -38,9 +38,9 @@ #define _GPIO_H_ #include "scc/tlm_target.h" -#include "scc/signal_target_mixin.h" -#include "scc/signal_initiator_mixin.h" -#include +#include "tlm/scc/signal_target_mixin.h" +#include "tlm/scc/signal_initiator_mixin.h" +#include namespace sysc { @@ -54,13 +54,13 @@ public: sc_core::sc_in rst_i; // sc_core::sc_inout_rv<32> pins_io; - sc_core::sc_vector pins_o; - sc_core::sc_vector pins_i; + sc_core::sc_vector pins_o; + sc_core::sc_vector pins_i; - sc_core::sc_vector iof0_o; - sc_core::sc_vector iof1_o; - sc_core::sc_vector iof0_i; - sc_core::sc_vector iof1_i; + sc_core::sc_vector iof0_o; + sc_core::sc_vector iof1_o; + sc_core::sc_vector iof0_i; + sc_core::sc_vector iof1_i; gpio(sc_core::sc_module_name nm); virtual ~gpio() override; // need to keep it in source file because of fwd declaration of gpio_regs @@ -69,16 +69,16 @@ protected: void clock_cb(); void reset_cb(); void update_pins(uint32_t changed_bits); - 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); + void pin_input(unsigned int tag, tlm::scc::tlm_signal_gp<>& gp, sc_core::sc_time& delay); + void forward_pin_input(unsigned int tag, tlm::scc::tlm_signal_gp<>& gp); + void iof_input(unsigned int tag, unsigned iof_idx, tlm::scc::tlm_signal_gp<>& gp, sc_core::sc_time& delay); sc_core::sc_time clk; std::array last_iof0, last_iof1; std::unique_ptr regs; std::shared_ptr handler; private: - tlm::tlm_phase write_output(tlm::tlm_signal_gp<>& gp, size_t i, bool val); + tlm::tlm_phase write_output(tlm::scc::tlm_signal_gp<>& gp, size_t i, bool val); }; } /* namespace sysc */ diff --git a/examples/simple_system/plic.cpp b/examples/simple_system/plic.cpp index 4bbfb45..58254c8 100644 --- a/examples/simple_system/plic.cpp +++ b/examples/simple_system/plic.cpp @@ -119,7 +119,7 @@ void plic::global_int_port_cb() { if (enable && global_interrupts_i[i].read() == 1) { regs->r_pending = regs->r_pending | (0x1 << i); - SCDEBUG("plic") << "pending interrupt identified: " << i; + SCCDEBUG("plic") << "pending interrupt identified: " << i; } } @@ -147,7 +147,7 @@ void plic::handle_pending_int() { claim_prio = prio; claim_int = i; raise_int = 1; - SCDEBUG("plic") << "pending interrupt activated: " << i; + SCCDEBUG("plic") << "pending interrupt activated: " << i; } } } @@ -158,14 +158,14 @@ void plic::handle_pending_int() { // todo: evluate clock period } else { regs->r_claim_complete = 0; - SCDEBUG("plic") << "no further pending interrupt."; + SCCDEBUG("plic") << "no further pending interrupt."; } } void plic::reset_pending_int(uint32_t irq) { // todo: evaluate enable register (see spec) // todo: make sure that pending is set, otherwise don't reset irq ... read spec. - SCDEBUG("plic") << "reset pending interrupt: " << irq; + SCCDEBUG("plic") << "reset pending interrupt: " << irq; // reset related pending bit regs->r_pending &= ~(0x1 << irq); core_interrupt_o.write(0); diff --git a/examples/simple_system/sc_main.cpp b/examples/simple_system/sc_main.cpp index 09da67b..131b19f 100644 --- a/examples/simple_system/sc_main.cpp +++ b/examples/simple_system/sc_main.cpp @@ -22,7 +22,6 @@ #include "simple_system.h" #include -#include #include #include @@ -67,7 +66,7 @@ int sc_main(int argc, char *argv[]) { /////////////////////////////////////////////////////////////////////////// // configure logging /////////////////////////////////////////////////////////////////////////// - scc::init_logging(vm.count("debug")?logging::DEBUG:logging::INFO); + scc::init_logging(vm.count("debug")?scc::log::DEBUG:scc::log::INFO); /////////////////////////////////////////////////////////////////////////// // set up tracing & transaction recording /////////////////////////////////////////////////////////////////////////// @@ -86,7 +85,7 @@ int sc_main(int argc, char *argv[]) { // todo: provide end-of-simulation macros if (!sc_core::sc_end_of_simulation_invoked()) { - SCERR() << "simulation timed out"; + SCCERR() << "simulation timed out"; sc_core::sc_stop(); } return SUCCESS; diff --git a/examples/simple_system/simple_system.h b/examples/simple_system/simple_system.h index 3c3a17a..45ac6f7 100644 --- a/examples/simple_system/simple_system.h +++ b/examples/simple_system/simple_system.h @@ -49,7 +49,7 @@ public: sc_core::sc_signal s_rst; sc_core::sc_vector> s_global_interrupts; sc_core::sc_signal s_core_interrupt; - sc_core::sc_vector> s_gpio; + sc_core::sc_vector> s_gpio; simple_system(sc_core::sc_module_name nm); diff --git a/examples/simple_system/test_initiator.cpp b/examples/simple_system/test_initiator.cpp index e176afc..6f9fa59 100644 --- a/examples/simple_system/test_initiator.cpp +++ b/examples/simple_system/test_initiator.cpp @@ -215,7 +215,7 @@ void test_initiator::write_bus(std::uint32_t adr, std::uint32_t dat) { data[1] = 0xff & dat >> 8; data[0] = 0xff & dat; - SCDEBUG("test_initiator") << "write_bus(0x" << std::hex << adr << ") : " << dat; + SCCDEBUG("test_initiator") << "write_bus(0x" << std::hex << adr << ") : " << dat; gp.set_command(tlm::TLM_WRITE_COMMAND); gp.set_address(adr); @@ -252,21 +252,21 @@ std::uint32_t test_initiator::read_bus(std::uint32_t adr) { // todo: use reinterpret_cast instead std::uint32_t rdat = data[3] << 24 | data[2] << 16 | data[1] << 8 | data[0]; - SCDEBUG("test_initiator") << "read_bus(0x" << std::hex << adr << ") -> " << rdat; + SCCDEBUG("test_initiator") << "read_bus(0x" << std::hex << adr << ") -> " << rdat; return rdat; } void test_initiator::reg_check(std::uint32_t adr, std::uint32_t exp) { uint32_t dat = read_bus(adr); if (dat != exp) { - SCERR("test_initiator") << "register check failed for address 0x" << std::hex << adr << ": " << dat << " != " << exp; + SCCERR("test_initiator") << "register check failed for address 0x" << std::hex << adr << ": " << dat << " != " << exp; } else { - SCDEBUG("test_initiator") << "register check passed for address 0x" << std::hex << adr << ": " << dat; + SCCDEBUG("test_initiator") << "register check passed for address 0x" << std::hex << adr << ": " << dat; } } void test_initiator::core_irq_handler() { - SCDEBUG("test_initiator") << "core_interrupt_i edge detected -> " << core_interrupt_i.read(); + SCCDEBUG("test_initiator") << "core_interrupt_i edge detected -> " << core_interrupt_i.read(); } } /* namespace sysc */ diff --git a/scc b/scc index c8f34d0..2a11251 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit c8f34d004bbf0c38d976cfa55bd85a1145281235 +Subproject commit 2a11251ae63f3470245e13f4f576e4c93d2f243c