Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/32640 )
Change subject: util,systemc: Update the gem5-within-systemc TLM example
code.
......................................................................
util,systemc: Update the gem5-within-systemc TLM example code.
Some class names within gem5 changed in March of last year, and this
code was not updated to match. Change ExternalMaster::Port to
ExternalMaster::ExternalPort, and ExternalSlave::Port to
ExternalSlave::ExternalPort.
Change-Id: I04c0970c4107de3449473c24c7c6f99ada72bbb3
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32640
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M util/tlm/src/sc_master_port.cc
M util/tlm/src/sc_master_port.hh
M util/tlm/src/sc_slave_port.cc
M util/tlm/src/sc_slave_port.hh
4 files changed, 12 insertions(+), 12 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/tlm/src/sc_master_port.cc b/util/tlm/src/sc_master_port.cc
index 2123b86..2d569e8 100644
--- a/util/tlm/src/sc_master_port.cc
+++ b/util/tlm/src/sc_master_port.cc
@@ -83,7 +83,7 @@
const std::string& systemc_name,
ExternalMaster& owner_,
Gem5SimControl& simControl)
- : ExternalMaster::Port(name_, owner_),
+ : ExternalMaster::ExternalPort(name_, owner_),
peq(this, &SCMasterPort::peq_cb),
waitForRetry(false),
pendingRequest(nullptr),
@@ -410,7 +410,7 @@
"received address range change but ignored it");
}
-ExternalMaster::Port*
+ExternalMaster::ExternalPort*
SCMasterPortHandler::getExternalPort(const std::string &name,
ExternalMaster &owner,
const std::string &port_data)
diff --git a/util/tlm/src/sc_master_port.hh b/util/tlm/src/sc_master_port.hh
index f799b8f..93f5194 100644
--- a/util/tlm/src/sc_master_port.hh
+++ b/util/tlm/src/sc_master_port.hh
@@ -71,7 +71,7 @@
* It is assumed that the mode (atomic/timing) does not change during
* execution.
*/
-class SCMasterPort : public ExternalMaster::Port
+class SCMasterPort : public ExternalMaster::ExternalPort
{
private:
struct TlmSenderState : public Packet::SenderState
@@ -149,9 +149,9 @@
public:
SCMasterPortHandler(Gem5SimControl& control) : control(control) {}
- ExternalMaster::Port *getExternalPort(const std::string &name,
- ExternalMaster &owner,
- const std::string &port_data);
+ ExternalMaster::ExternalPort *
+ getExternalPort(const std::string &name, ExternalMaster &owner,
+ const std::string &port_data);
};
}
diff --git a/util/tlm/src/sc_slave_port.cc b/util/tlm/src/sc_slave_port.cc
index 5a01f0c..a3b8783 100644
--- a/util/tlm/src/sc_slave_port.cc
+++ b/util/tlm/src/sc_slave_port.cc
@@ -361,7 +361,7 @@
SCSlavePort::SCSlavePort(const std::string &name_,
const std::string &systemc_name,
ExternalSlave &owner_) :
- ExternalSlave::Port(name_, owner_),
+ ExternalSlave::ExternalPort(name_, owner_),
blockingRequest(NULL),
needToSendRequestRetry(false),
blockingResponse(NULL),
@@ -380,7 +380,7 @@
&SCSlavePort::nb_transport_bw);
}
-ExternalSlave::Port*
+ExternalSlave::ExternalPort*
SCSlavePortHandler::getExternalPort(const std::string &name,
ExternalSlave &owner,
const std::string &port_data)
diff --git a/util/tlm/src/sc_slave_port.hh b/util/tlm/src/sc_slave_port.hh
index 1106194..ef75aab 100644
--- a/util/tlm/src/sc_slave_port.hh
+++ b/util/tlm/src/sc_slave_port.hh
@@ -65,7 +65,7 @@
* original packet as a payload extension, the packet can be restored and
send
* back to the gem5 world upon receiving a response from the SystemC world.
*/
-class SCSlavePort : public ExternalSlave::Port
+class SCSlavePort : public ExternalSlave::ExternalPort
{
public:
/** One instance of pe and the related callback needed */
@@ -125,9 +125,9 @@
public:
SCSlavePortHandler(Gem5SimControl& control) : control(control) {}
- ExternalSlave::Port *getExternalPort(const std::string &name,
- ExternalSlave &owner,
- const std::string &port_data);
+ ExternalSlave::ExternalPort *
+ getExternalPort(const std::string &name, ExternalSlave &owner,
+ const std::string &port_data);
};
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/32640
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: I04c0970c4107de3449473c24c7c6f99ada72bbb3
Gerrit-Change-Number: 32640
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matthias Jung <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
