diff options
author | Gabe Black <gabeblack@google.com> | 2019-04-22 19:45:10 -0700 |
---|---|---|
committer | Gabe Black <gabeblack@google.com> | 2019-04-28 01:19:40 +0000 |
commit | cdcc55a6a8fe9b4625b316a8d8845366ccfa71c9 (patch) | |
tree | 893cea35432466600b55a2e4434ed61ba1e28f69 /src/mem/qport.hh | |
parent | 3cfff8574a19536e2b3d057b43b59fcf35932c81 (diff) | |
download | gem5-cdcc55a6a8fe9b4625b316a8d8845366ccfa71c9.tar.xz |
mem: Minimize the use of MemObject.
MemObject doesn't provide anything beyond its base ClockedObject any
more, so this change removes it from most inheritance hierarchies.
Occasionally MemObject is replaced with SimObject when I was fairly
confident that the extra functionality of ClockedObject wasn't needed.
Change-Id: Ic014ab61e56402e62548e8c831eb16e26523fdce
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18289
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/mem/qport.hh')
-rw-r--r-- | src/mem/qport.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mem/qport.hh b/src/mem/qport.hh index 77d8dfafa..6d9655f41 100644 --- a/src/mem/qport.hh +++ b/src/mem/qport.hh @@ -47,6 +47,7 @@ #include "mem/packet_queue.hh" #include "mem/port.hh" +#include "sim/sim_object.hh" /** * A queued port is a port that has an infinite queue for outgoing @@ -75,7 +76,7 @@ class QueuedSlavePort : public SlavePort * behaviuor in a subclass, and provide the latter to the * QueuePort constructor. */ - QueuedSlavePort(const std::string& name, MemObject* owner, + QueuedSlavePort(const std::string& name, SimObject* owner, RespPacketQueue &resp_queue, PortID id = InvalidPortID) : SlavePort(name, owner, id), respQueue(resp_queue) { } @@ -128,7 +129,7 @@ class QueuedMasterPort : public MasterPort * behaviuor in a subclass, and provide the latter to the * QueuePort constructor. */ - QueuedMasterPort(const std::string& name, MemObject* owner, + QueuedMasterPort(const std::string& name, SimObject* owner, ReqPacketQueue &req_queue, SnoopRespPacketQueue &snoop_resp_queue, PortID id = InvalidPortID) : |