summaryrefslogtreecommitdiff
path: root/src/mem/MemObject.py
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2019-01-25 14:26:21 +0000
committerAndreas Sandberg <andreas.sandberg@arm.com>2019-02-12 09:43:00 +0000
commitef71a987c1987f7543d3bf76ed9e5ce62f4d1daa (patch)
treec672aa096c0088820c7ffa341b2d603cef6f66d6 /src/mem/MemObject.py
parent9fbfb45e51e657b364334a1c96ba23698d181edb (diff)
downloadgem5-ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa.tar.xz
python: Don't assume SimObjects live in the global namespace
The importer in Python 3 doesn't like the way we import SimObjects from the global namespace. Convert the existing SimObject declarations to import from m5.objects. As a side-effect, this makes these files consistent with configuration files. Change-Id: I11153502b430822130722839e1fa767b82a027aa Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/15981 Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Diffstat (limited to 'src/mem/MemObject.py')
-rw-r--r--src/mem/MemObject.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/MemObject.py b/src/mem/MemObject.py
index 0827218aa..42d561d73 100644
--- a/src/mem/MemObject.py
+++ b/src/mem/MemObject.py
@@ -26,7 +26,7 @@
#
# Authors: Ron Dreslinski
-from ClockedObject import ClockedObject
+from m5.objects.ClockedObject import ClockedObject
class MemObject(ClockedObject):
type = 'MemObject'