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/cpu/minor/MinorCPU.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/cpu/minor') diff --git a/src/cpu/minor/MinorCPU.py b/src/cpu/minor/MinorCPU.py index 9e285a4d1..bb4df82f0 100644 --- a/src/cpu/minor/MinorCPU.py +++ b/src/cpu/minor/MinorCPU.py @@ -46,12 +46,12 @@ from m5.defines import buildEnv from m5.params import * from m5.proxy import * from m5.SimObject import SimObject -from BaseCPU import BaseCPU -from DummyChecker import DummyChecker -from BranchPredictor import * -from TimingExpr import TimingExpr +from m5.objects.BaseCPU import BaseCPU +from m5.objects.DummyChecker import DummyChecker +from m5.objects.BranchPredictor import * +from m5.objects.TimingExpr import TimingExpr -from FuncUnit import OpClass +from m5.objects.FuncUnit import OpClass class MinorOpClass(SimObject): """Boxing of OpClass to get around build problems and provide a hook for -- cgit v1.2.3