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/abstract_mem.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/abstract_mem.hh')
| -rw-r--r-- | src/mem/abstract_mem.hh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mem/abstract_mem.hh b/src/mem/abstract_mem.hh index cf9ca7439..18d8ee909 100644 --- a/src/mem/abstract_mem.hh +++ b/src/mem/abstract_mem.hh @@ -50,8 +50,9 @@ #define __MEM_ABSTRACT_MEMORY_HH__ #include "mem/backdoor.hh" -#include "mem/mem_object.hh" +#include "mem/port.hh" #include "params/AbstractMemory.hh" +#include "sim/clocked_object.hh" #include "sim/stats.hh" @@ -98,10 +99,10 @@ class LockedAddr { * An abstract memory represents a contiguous block of physical * memory, with an associated address range, and also provides basic * functionality for reading and writing this memory without any - * timing information. It is a MemObject since any subclass must have - * at least one slave port. + * timing information. It is a ClockedObject since subclasses may need timing + * information. */ -class AbstractMemory : public MemObject +class AbstractMemory : public ClockedObject { protected: |