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/arch/sparc/SparcNativeTrace.py | 3 ++- src/arch/sparc/SparcSystem.py | 4 ++-- src/arch/sparc/SparcTLB.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/arch/sparc') diff --git a/src/arch/sparc/SparcNativeTrace.py b/src/arch/sparc/SparcNativeTrace.py index 46b606652..1dbac34c3 100644 --- a/src/arch/sparc/SparcNativeTrace.py +++ b/src/arch/sparc/SparcNativeTrace.py @@ -28,7 +28,8 @@ from m5.SimObject import SimObject from m5.params import * -from CPUTracers import NativeTrace + +from m5.objects.CPUTracers import NativeTrace class SparcNativeTrace(NativeTrace): type = 'SparcNativeTrace' diff --git a/src/arch/sparc/SparcSystem.py b/src/arch/sparc/SparcSystem.py index 9d8be5d06..60c56c69b 100644 --- a/src/arch/sparc/SparcSystem.py +++ b/src/arch/sparc/SparcSystem.py @@ -28,8 +28,8 @@ from m5.params import * -from SimpleMemory import SimpleMemory -from System import System +from m5.objects.SimpleMemory import SimpleMemory +from m5.objects.System import System class SparcSystem(System): type = 'SparcSystem' diff --git a/src/arch/sparc/SparcTLB.py b/src/arch/sparc/SparcTLB.py index 219f6842a..a7bfaea2a 100644 --- a/src/arch/sparc/SparcTLB.py +++ b/src/arch/sparc/SparcTLB.py @@ -29,7 +29,7 @@ from m5.SimObject import SimObject from m5.params import * -from BaseTLB import BaseTLB +from m5.objects.BaseTLB import BaseTLB class SparcTLB(BaseTLB): type = 'SparcTLB' -- cgit v1.2.3