[gem5-dev] Change in gem5/gem5[develop]: systemc: Update instances of masterId

[Shivani Parekh (Gerrit) via gem5-dev]

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

Change subject: systemc: Update instances of masterId
......................................................................

systemc: Update instances of masterId

Change-Id: Id6ba9557b4208299ce3023f929e4d26bc3855af0
---
M src/systemc/tlm_bridge/tlm_to_gem5.cc
M src/systemc/tlm_bridge/tlm_to_gem5.hh
2 files changed, 8 insertions(+), 8 deletions(-)



diff --git a/src/systemc/tlm_bridge/tlm_to_gem5.cc  
b/src/systemc/tlm_bridge/tlm_to_gem5.cc
index e6cb483..45ceb79 100644
--- a/src/systemc/tlm_bridge/tlm_to_gem5.cc
+++ b/src/systemc/tlm_bridge/tlm_to_gem5.cc
@@ -67,7 +67,7 @@
 {

 PacketPtr
-payload2packet(MasterID masterId, tlm::tlm_generic_payload &trans)
+payload2packet(MasterID _id, tlm::tlm_generic_payload &trans)
 {
     MemCmd cmd;

@@ -87,7 +87,7 @@

     Request::Flags flags;
     auto req = std::make_shared<Request>(
-        trans.get_address(), trans.get_data_length(), flags, masterId);
+        trans.get_address(), trans.get_data_length(), flags, _id);

     /*
      * Allocate a new Packet. The packet will be deleted when it returns  
from
@@ -156,7 +156,7 @@
         extension->setPipeThrough();
         pkt = extension->getPacket();
     } else {
-        pkt = payload2packet(masterId, trans);
+        pkt = payload2packet(_id, trans);
     }

     auto tlmSenderState = new TlmSenderState(trans);
@@ -274,7 +274,7 @@
         extension->setPipeThrough();
         pkt = extension->getPacket();
     } else {
-        pkt = payload2packet(masterId, trans);
+        pkt = payload2packet(_id, trans);
     }

     MemBackdoorPtr backdoor = nullptr;
@@ -311,7 +311,7 @@
         extension->setPipeThrough();
         bmp.sendFunctional(extension->getPacket());
     } else {
-        auto pkt = payload2packet(masterId, trans);
+        auto pkt = payload2packet(_id, trans);
         if (pkt) {
             bmp.sendFunctional(pkt);
             destroyPacket(pkt);
@@ -337,7 +337,7 @@
         extension->setPipeThrough();
         pkt = extension->getPacket();
     } else {
-        pkt = payload2packet(masterId, trans);
+        pkt = payload2packet(_id, trans);
         pkt->req->setFlags(Request::NO_ACCESS);
     }

@@ -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(
+    _id(params->system->getGlobalMasterId(
                 std::string("[systemc].") + name()))
 {
 }
diff --git a/src/systemc/tlm_bridge/tlm_to_gem5.hh  
b/src/systemc/tlm_bridge/tlm_to_gem5.hh
index e2e7540..b060da8 100644
--- a/src/systemc/tlm_bridge/tlm_to_gem5.hh
+++ b/src/systemc/tlm_bridge/tlm_to_gem5.hh
@@ -171,7 +171,7 @@

     void before_end_of_elaboration() override;

-    const MasterID masterId;
+    const MasterID _id;
 };

 } // namespace sc_gem5

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33539
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: Id6ba9557b4208299ce3023f929e4d26bc3855af0
Gerrit-Change-Number: 33539
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