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/mport.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/mport.hh')
| -rw-r--r-- | src/mem/mport.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/mport.hh b/src/mem/mport.hh index 72d0b0962..6655b1143 100644 --- a/src/mem/mport.hh +++ b/src/mem/mport.hh @@ -43,8 +43,8 @@ #ifndef __MEM_MPORT_HH__ #define __MEM_MPORT_HH__ -#include "mem/mem_object.hh" #include "mem/tport.hh" +#include "sim/sim_object.hh" /* * This file defines a port class which is used for sending and receiving @@ -57,7 +57,7 @@ class MessageSlavePort : public SimpleTimingPort { public: - MessageSlavePort(const std::string &name, MemObject *owner) : + MessageSlavePort(const std::string &name, SimObject *owner) : SimpleTimingPort(name, owner) {} @@ -75,7 +75,7 @@ class MessageMasterPort : public QueuedMasterPort { public: - MessageMasterPort(const std::string &name, MemObject *owner) : + MessageMasterPort(const std::string &name, SimObject *owner) : QueuedMasterPort(name, owner, reqQueue, snoopRespQueue), reqQueue(*owner, *this), snoopRespQueue(*owner, *this) {} |