From f122b0ae4ee20d22c42d03ebda61dc919499556f Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 17 Aug 2024 12:41:51 +0200 Subject: [PATCH] cleans up code wrt. to latest dbt-rise-tgc --- src/CLIParser.cpp | 2 -- src/tgc_vp/system.h | 2 +- tgc-iss/dbt-rise-core | 2 +- tgc-iss/dbt-rise-tgc | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/CLIParser.cpp b/src/CLIParser.cpp index e80ed7d..b686d11 100644 --- a/src/CLIParser.cpp +++ b/src/CLIParser.cpp @@ -55,8 +55,6 @@ CLIParser::CLIParser(int argc, char *argv[]) .logLevel(vm_["verbose"].as()) .logFilterRegex(vm_["log-filter"].as()) .logAsync(!vm_["log-sync"].as())); - scc::stream_redirection cout_redir(std::cout, scc::log::DEBUG); - scc::stream_redirection cerr_redir(std::cerr, scc::log::ERROR); sc_core::sc_report_handler::set_actions("/IEEE_Std_1666/deprecated", sc_core::SC_DO_NOTHING); sc_core::sc_report_handler::set_actions(sc_core::SC_ID_MORE_THAN_ONE_SIGNAL_DRIVER_, sc_core::SC_DO_NOTHING); sc_core::sc_report_handler::set_actions(sc_core::SC_ERROR, sc_core::SC_LOG | sc_core::SC_CACHE_REPORT | sc_core::SC_DISPLAY | sc_core::SC_STOP); diff --git a/src/tgc_vp/system.h b/src/tgc_vp/system.h index e8530df..1a21f0b 100644 --- a/src/tgc_vp/system.h +++ b/src/tgc_vp/system.h @@ -52,7 +52,7 @@ public: system(sc_core::sc_module_name nm); private: - sysc::tgfs::core_complex core_complex{"core_complex"}; + sysc::tgfs::core_complex<> core_complex{"core_complex"}; scc::router<> ahb_router, apbBridge; vpvper::minres::gpio_tl gpio0{"gpio0"}; vpvper::minres::uart_tl uart0{"uart0"}; diff --git a/tgc-iss/dbt-rise-core b/tgc-iss/dbt-rise-core index 287936e..f1beb88 160000 --- a/tgc-iss/dbt-rise-core +++ b/tgc-iss/dbt-rise-core @@ -1 +1 @@ -Subproject commit 287936e0dfaaa8c488c8aba20247d4dd613b2d40 +Subproject commit f1beb88a6158a7ab20b8cc539d042103200b2f42 diff --git a/tgc-iss/dbt-rise-tgc b/tgc-iss/dbt-rise-tgc index 933f084..0996d15 160000 --- a/tgc-iss/dbt-rise-tgc +++ b/tgc-iss/dbt-rise-tgc @@ -1 +1 @@ -Subproject commit 933f08494c50f13f317ac67d7373b20bd7136d2e +Subproject commit 0996d15bd406d3a73f4860d57b9d468444043843