Merge pull request #20 from markfoodyburton/update-upstream

Update upstream
accellera-official · Jun 28, 2024 · 5e537b1 · 5e537b1
2 parents 1153104 + 504a7b0
commit 5e537b1
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 36 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,11 +24,8 @@ cpmaddpackage(
   NAME SystemCLanguage
   GIT_REPOSITORY  ${GITHUB}accellera-official/systemc.git
   GIT_SHALLOW True
-  GIT_TAG master
+  GIT_TAG main
 )
-if(SystemCLanguage_ADDED)
-set(SystemCLanguage_FOUND TRUE)
-endif()
 
 cpmaddpackage(
   NAME initiator_id

diff --git a/report/CMakeLists.txt b/report/CMakeLists.txt
@@ -24,30 +24,14 @@ cpmaddpackage(
   NAME SystemCLanguage
   GIT_REPOSITORY  ${GITHUB}accellera-official/systemc.git
   GIT_SHALLOW True
-  GIT_TAG master
+  GIT_TAG main
 )
 
-cpmaddpackage(
-  NAME
-  RapidJSON
-  GIT_REPOSITORY
-  https://github.com/Tencent/rapidjson
-  GIT_TAG
-  e0f68a435610e70ab5af44fc6a90523d69b210b3
-  GIT_SHALLOW
-  FALSE
-  OPTIONS
-  "RAPIDJSON_BUILD_TESTS OFF"
-  "RAPIDJSON_BUILD_DOC OFF"
-  "RAPIDJSON_BUILD_EXAMPLES OFF")
-
-set(RapidJSON_DIR "${RapidJSON_BINARY_DIR}")
-
 cpmaddpackage(
   NAME SystemCCCI
   GIT_REPOSITORY  ${GITHUB}accellera-official/cci.git
   GIT_SHALLOW True
-  GIT_TAG master
+  GIT_TAG main
 )
 
 set(WITH_FMT "true" CACHE STRING "Include FMT library")

diff --git a/report/include/scp/helpers.h b/report/include/scp/helpers.h
@@ -46,7 +46,7 @@ static std::string scp_txn_tostring(tlm::tlm_generic_payload& trans) {
              << (unsigned int)(ptr[i - 1]);
     }
     info << " status: " << trans.get_response_string() << " ";
-    for (int i = 0; i < tlm::max_num_extensions(); i++) {
+    for (unsigned int i = 0; i < tlm::max_num_extensions(); i++) {
         if (trans.get_extension(i)) {
             info << " extn:" << i;
         }

diff --git a/report/include/scp/report.h b/report/include/scp/report.h
@@ -450,7 +450,7 @@ class call_sc_name_fn
     // define a function IF NOT the method exists
     template <class TYPE>
     auto operator()(TYPE* p) const
-        -> std::enable_if_t<not has_method<TYPE>, const char*> {
+        -> std::enable_if_t<!has_method<TYPE>, const char*> {
         return nullptr;
     }
 };

diff --git a/report/src/report.cpp b/report/src/report.cpp
@@ -572,11 +572,7 @@ sc_core::sc_verbosity cci_lookup(cci::cci_broker_handle broker,
         auto val = broker.get_preset_cci_value(param_name);
 
         if (val.is_int()) {
-            broker.ignore_unconsumed_preset_values(
-                [param_name](const std::pair<std::string, cci::cci_value>& iv)
-                    -> bool { return iv.first == param_name; });
             broker.lock_preset_value(param_name);
-
             return verbosity.at(
                 std::min<unsigned>(val.get_int(), verbosity.size() - 1));
         }

diff --git a/tlm_extensions/initiator_id/CMakeLists.txt b/tlm_extensions/initiator_id/CMakeLists.txt
@@ -21,10 +21,10 @@ include(${cpm-cmake_SOURCE_DIR}/cmake/CPM.cmake)
 cpmaddpackage("${GITHUB}TheLartians/[email protected]")
 
 cpmaddpackage(
-  NAME SystemCLanguage
-  GIT_REPOSITORY  ${GITHUB}accellera-official/systemc.git
-  GIT_SHALLOW True
-  GIT_TAG master
+   NAME SystemCLanguage
+   GIT_REPOSITORY  ${GITHUB}accellera-official/systemc.git
+   GIT_SHALLOW True
+   GIT_TAG main
 )
 
 add_library(${PROJECT_NAME} INTERFACE)

diff --git a/tlm_extensions/path_trace/CMakeLists.txt b/tlm_extensions/path_trace/CMakeLists.txt
@@ -21,10 +21,10 @@ include(${cpm-cmake_SOURCE_DIR}/cmake/CPM.cmake)
 cpmaddpackage("${GITHUB}TheLartians/[email protected]")
 
 cpmaddpackage(
-  NAME SystemCLanguage
-  GIT_REPOSITORY  ${GITHUB}accellera-official/systemc.git
-  GIT_SHALLOW True
-  GIT_TAG master
+   NAME SystemCLanguage
+   GIT_REPOSITORY  ${GITHUB}accellera-official/systemc.git
+   GIT_SHALLOW True
+   GIT_TAG main
 )
 
 add_library(${PROJECT_NAME} INTERFACE)