diff options
author | Gabe Black <gabeblack@google.com> | 2019-09-06 16:31:13 -0700 |
---|---|---|
committer | Gabe Black <gabeblack@google.com> | 2019-09-09 01:54:36 +0000 |
commit | 37551510ea4b4b4eca16785393f7b17abd50f00e (patch) | |
tree | 690a00d6fdd4ff952b2121822b508d0ac90d79ac /src/dev/arm | |
parent | 286b6267afde29fcbe7d6aa3950ded6dba9eda1e (diff) | |
download | gem5-37551510ea4b4b4eca16785393f7b17abd50f00e.tar.xz |
dev: Scrub out some lingering uses of MemObject.
MemObject doesn't do anything any more, and is basically just an alias
for ClockedObject.
Change-Id: Ic0e1658609e4e1d7f4b829fbc421f222e4869dee
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20719
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src/dev/arm')
-rw-r--r-- | src/dev/arm/SMMUv3.py | 6 | ||||
-rw-r--r-- | src/dev/arm/smmu_v3.cc | 6 | ||||
-rw-r--r-- | src/dev/arm/smmu_v3.hh | 4 | ||||
-rw-r--r-- | src/dev/arm/smmu_v3_slaveifc.cc | 4 | ||||
-rw-r--r-- | src/dev/arm/smmu_v3_slaveifc.hh | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/dev/arm/SMMUv3.py b/src/dev/arm/SMMUv3.py index 0126c2b49..72540f5cf 100644 --- a/src/dev/arm/SMMUv3.py +++ b/src/dev/arm/SMMUv3.py @@ -40,9 +40,9 @@ from m5.params import * from m5.proxy import * from m5.util.fdthelper import * from m5.SimObject import * -from m5.objects.MemObject import MemObject +from m5.objects.ClockedObject import ClockedObject -class SMMUv3SlaveInterface(MemObject): +class SMMUv3SlaveInterface(ClockedObject): type = 'SMMUv3SlaveInterface' cxx_header = 'dev/arm/smmu_v3_slaveifc.hh' @@ -73,7 +73,7 @@ class SMMUv3SlaveInterface(MemObject): prefetch_reserve_last_way = Param.Bool(True, 'Reserve last way of the main TLB for prefetched entries') -class SMMUv3(MemObject): +class SMMUv3(ClockedObject): type = 'SMMUv3' cxx_header = 'dev/arm/smmu_v3.hh' diff --git a/src/dev/arm/smmu_v3.cc b/src/dev/arm/smmu_v3.cc index e278c0e25..f6c5f90df 100644 --- a/src/dev/arm/smmu_v3.cc +++ b/src/dev/arm/smmu_v3.cc @@ -54,7 +54,7 @@ #include "sim/system.hh" SMMUv3::SMMUv3(SMMUv3Params *params) : - MemObject(params), + ClockedObject(params), system(*params->system), masterId(params->system->getMasterId(this)), masterPort(name() + ".master", *this), @@ -739,7 +739,7 @@ SMMUv3::init() void SMMUv3::regStats() { - MemObject::regStats(); + ClockedObject::regStats(); using namespace Stats; @@ -824,7 +824,7 @@ SMMUv3::getPort(const std::string &name, PortID id) } else if (name == "control") { return controlPort; } else { - return MemObject::getPort(name, id); + return ClockedObject::getPort(name, id); } } diff --git a/src/dev/arm/smmu_v3.hh b/src/dev/arm/smmu_v3.hh index f02ef2f77..e0768298d 100644 --- a/src/dev/arm/smmu_v3.hh +++ b/src/dev/arm/smmu_v3.hh @@ -55,9 +55,9 @@ #include "dev/arm/smmu_v3_proc.hh" #include "dev/arm/smmu_v3_ptops.hh" #include "dev/arm/smmu_v3_slaveifc.hh" -#include "mem/mem_object.hh" #include "mem/packet.hh" #include "params/SMMUv3.hh" +#include "sim/clocked_object.hh" #include "sim/eventq.hh" /** @@ -80,7 +80,7 @@ */ class SMMUTranslationProcess; -class SMMUv3 : public MemObject +class SMMUv3 : public ClockedObject { protected: diff --git a/src/dev/arm/smmu_v3_slaveifc.cc b/src/dev/arm/smmu_v3_slaveifc.cc index 0ed6c4d48..3f92023d7 100644 --- a/src/dev/arm/smmu_v3_slaveifc.cc +++ b/src/dev/arm/smmu_v3_slaveifc.cc @@ -46,7 +46,7 @@ SMMUv3SlaveInterface::SMMUv3SlaveInterface( const SMMUv3SlaveInterfaceParams *p) : - MemObject(p), + ClockedObject(p), smmu(nullptr), microTLB(new SMMUTLB(p->utlb_entries, p->utlb_assoc, @@ -99,7 +99,7 @@ SMMUv3SlaveInterface::getPort(const std::string &name, PortID id) } else if (name == "ats_slave") { return atsSlavePort; } else { - return MemObject::getPort(name, id); + return ClockedObject::getPort(name, id); } } diff --git a/src/dev/arm/smmu_v3_slaveifc.hh b/src/dev/arm/smmu_v3_slaveifc.hh index 3e03ae49a..7838e4ad0 100644 --- a/src/dev/arm/smmu_v3_slaveifc.hh +++ b/src/dev/arm/smmu_v3_slaveifc.hh @@ -47,14 +47,14 @@ #include "dev/arm/smmu_v3_events.hh" #include "dev/arm/smmu_v3_ports.hh" #include "dev/arm/smmu_v3_proc.hh" -#include "mem/mem_object.hh" #include "params/SMMUv3SlaveInterface.hh" +#include "sim/clocked_object.hh" class SMMUTranslationProcess; class SMMUv3; class SMMUSlavePort; -class SMMUv3SlaveInterface : public MemObject +class SMMUv3SlaveInterface : public ClockedObject { protected: friend class SMMUTranslationProcess; |