[gem5-dev] Change in gem5/gem5[develop]: sim,systemc: functions getGlobalMasterId and leafMasterName

[Shivani Parekh (Gerrit) via gem5-dev]

Shivani Parekh has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/33646 )

Change subject: sim,systemc: functions getGlobalMasterId and leafMasterName
......................................................................

sim,systemc: functions getGlobalMasterId and leafMasterName

Change-Id: I13a3539b066bbcb6cec3fa29dfbfc480f863b56e
---
M src/sim/system.cc
M src/sim/system.hh
M src/systemc/tlm_bridge/tlm_to_gem5.cc
3 files changed, 7 insertions(+), 6 deletions(-)



diff --git a/src/sim/system.cc b/src/sim/system.cc
index bd9d980..a2538f2 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -591,7 +591,7 @@
 }

 MasterID
-System::getGlobalMasterId(const std::string& master_name)
+System::getGlobalUniqueId(const std::string& master_name)
 {
     return _getUniqueId(nullptr, master_name);
 }
@@ -599,7 +599,7 @@
 MasterID
 System::getUniqueId(const SimObject* master, std::string submaster)
 {
-    auto master_name = leafMasterName(master, submaster);
+    auto master_name = leafRequestorName(master, submaster);
     return _getUniqueId(master, master_name);
 }

@@ -634,7 +634,8 @@
 }

 std::string
-System::leafMasterName(const SimObject* master, const std::string&  
submaster)
+System::leafRequestorName(const SimObject* master, const std::string&
+                          submaster)
 {
     if (submaster.empty()) {
         return master->name();
diff --git a/src/sim/system.hh b/src/sim/system.hh
index d7d345a..8c2ed35 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -482,7 +482,7 @@
      * @param masterName full name of the master
      * @return the master's ID.
      */
-    MasterID getGlobalMasterId(const std::string& master_name);
+    MasterID getGlobalUniqueId(const std::string& master_name);

     /**
      * Get the name of an object for a given request id.
@@ -513,7 +513,7 @@
      * Helper function for constructing the full (sub)master name
      * by providing the root master and the relative submaster name.
      */
-    std::string leafMasterName(const SimObject* master,
+    std::string leafRequestorName(const SimObject* master,
                                const std::string& submaster);

   public:
diff --git a/src/systemc/tlm_bridge/tlm_to_gem5.cc  
b/src/systemc/tlm_bridge/tlm_to_gem5.cc
index e6cb483..2ac879d 100644
--- a/src/systemc/tlm_bridge/tlm_to_gem5.cc
+++ b/src/systemc/tlm_bridge/tlm_to_gem5.cc
@@ -470,7 +470,7 @@
     bmp(std::string(name()) + "master", *this), socket("tlm_socket"),
     wrapper(socket, std::string(name()) + ".tlm", InvalidPortID),
     system(params->system),
-    masterId(params->system->getGlobalMasterId(
+    masterId(params->system->getGlobalUniqueId(
                 std::string("[systemc].") + name()))
 {
 }

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33646
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I13a3539b066bbcb6cec3fa29dfbfc480f863b56e
Gerrit-Change-Number: 33646
Gerrit-PatchSet: 1
Gerrit-Owner: Shivani Parekh <shpar...@ucdavis.edu>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s