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/arch/generic | |
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/arch/generic')
-rw-r--r-- | src/arch/generic/BaseTLB.py | 4 | ||||
-rw-r--r-- | src/arch/generic/tlb.hh | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/arch/generic/BaseTLB.py b/src/arch/generic/BaseTLB.py index 688117a66..64531b9c5 100644 --- a/src/arch/generic/BaseTLB.py +++ b/src/arch/generic/BaseTLB.py @@ -29,9 +29,9 @@ # Ivan Pizarro from m5.params import * -from m5.objects.MemObject import MemObject +from m5.SimObject import SimObject -class BaseTLB(MemObject): +class BaseTLB(SimObject): type = 'BaseTLB' abstract = True cxx_header = "arch/generic/tlb.hh" diff --git a/src/arch/generic/tlb.hh b/src/arch/generic/tlb.hh index ba07b1057..cd33ef4c9 100644 --- a/src/arch/generic/tlb.hh +++ b/src/arch/generic/tlb.hh @@ -44,18 +44,16 @@ #define __ARCH_GENERIC_TLB_HH__ #include "base/logging.hh" -#include "mem/mem_object.hh" #include "mem/request.hh" +#include "sim/sim_object.hh" class ThreadContext; class BaseMasterPort; -class BaseTLB : public MemObject +class BaseTLB : public SimObject { protected: - BaseTLB(const Params *p) - : MemObject(p) - {} + BaseTLB(const Params *p) : SimObject(p) {} public: |