From: Emily Brickey <esbrickey@ucdavis.edu>
Date: Tue, 28 Jul 2020 22:36:14 +0000 (-0700)
Subject: misc: Updated port classes & refs to remove slaveBind()/UnBind()
X-Git-Tag: v20.1.0.0~228
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4810c364017f0f2fbaea24460fa93c157f577cb9;p=gem5.git

misc: Updated port classes & refs to remove slaveBind()/UnBind()

Change-Id: I9106397b8816d8148dd916510bbcf65ed499d303
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32309
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/mem/port.cc b/src/mem/port.cc
index 6460b5943..b9015717a 100644
--- a/src/mem/port.cc
+++ b/src/mem/port.cc
@@ -131,7 +131,7 @@ RequestPort::bind(Port &peer)
     _responsePort = response_port;
     Port::bind(peer);
     // response port also keeps track of request port
-    _responsePort->slaveBind(*this);
+    _responsePort->responderBind(*this);
 }
 
 void
@@ -139,7 +139,7 @@ RequestPort::unbind()
 {
     panic_if(!isConnected(), "Can't unbind request port %s which is "
     "not bound.", name());
-    _responsePort->slaveUnbind();
+    _responsePort->responderUnbind();
     _responsePort = &defaultResponsePort;
     Port::unbind();
 }
@@ -164,7 +164,7 @@ RequestPort::printAddr(Addr a)
 }
 
 /**
- * Slave port
+ * Response port
  */
 ResponsePort::ResponsePort(const std::string& name, SimObject* _owner,
     PortID id) : Port(name, id), _requestPort(&defaultRequestPort),
@@ -177,14 +177,14 @@ ResponsePort::~ResponsePort()
 }
 
 void
-ResponsePort::slaveUnbind()
+ResponsePort::responderUnbind()
 {
     _requestPort = &defaultRequestPort;
     Port::unbind();
 }
 
 void
-ResponsePort::slaveBind(RequestPort& request_port)
+ResponsePort::responderBind(RequestPort& request_port)
 {
     _requestPort = &request_port;
     Port::bind(request_port);
diff --git a/src/mem/port.hh b/src/mem/port.hh
index f378f0780..c933af62b 100644
--- a/src/mem/port.hh
+++ b/src/mem/port.hh
@@ -423,13 +423,13 @@ class ResponsePort : public Port, public AtomicResponseProtocol,
      * Called by the request port to unbind. Should never be called
      * directly.
      */
-    void slaveUnbind();
+    void responderUnbind();
 
     /**
      * Called by the request port to bind. Should never be called
      * directly.
      */
-    void slaveBind(RequestPort& request_port);
+    void responderBind(RequestPort& request_port);
 
     /**
      * Default implementations.
diff --git a/src/mem/token_port.cc b/src/mem/token_port.cc
index 1a8439d85..46d91164a 100644
--- a/src/mem/token_port.cc
+++ b/src/mem/token_port.cc
@@ -109,7 +109,7 @@ TokenSlavePort::bind(Port& peer)
 void
 TokenSlavePort::unbind()
 {
-    SlavePort::slaveUnbind();
+    SlavePort::responderUnbind();
     tokenMasterPort = nullptr;
 }