From ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Fri, 25 Jan 2019 14:26:21 +0000 Subject: 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 Reviewed-on: https://gem5-review.googlesource.com/c/15981 Reviewed-by: Jason Lowe-Power Reviewed-by: Giacomo Travaglini --- src/mem/XBar.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/mem/XBar.py') diff --git a/src/mem/XBar.py b/src/mem/XBar.py index 655d9808a..c9f35f3e5 100644 --- a/src/mem/XBar.py +++ b/src/mem/XBar.py @@ -39,12 +39,13 @@ # Authors: Nathan Binkert # Andreas Hansson -from MemObject import MemObject -from System import System +from m5.objects.System import System from m5.params import * from m5.proxy import * from m5.SimObject import SimObject +from m5.objects.MemObject import MemObject + class BaseXBar(MemObject): type = 'BaseXBar' abstract = True -- cgit v1.2.3