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/x86/X86LocalApic.py | 3 ++- src/arch/x86/X86NativeTrace.py | 3 ++- src/arch/x86/X86System.py | 11 ++++++----- src/arch/x86/X86TLB.py | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) (limited to 'src/arch/x86') diff --git a/src/arch/x86/X86LocalApic.py b/src/arch/x86/X86LocalApic.py index 5c14679c2..5d4910e98 100644 --- a/src/arch/x86/X86LocalApic.py +++ b/src/arch/x86/X86LocalApic.py @@ -41,7 +41,8 @@ from m5.defines import buildEnv from m5.params import * from m5.proxy import * -from Device import BasicPioDevice + +from m5.objects.Device import BasicPioDevice class X86LocalApic(BasicPioDevice): type = 'X86LocalApic' diff --git a/src/arch/x86/X86NativeTrace.py b/src/arch/x86/X86NativeTrace.py index e6eae8918..798fc879f 100644 --- a/src/arch/x86/X86NativeTrace.py +++ b/src/arch/x86/X86NativeTrace.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 X86NativeTrace(NativeTrace): type = 'X86NativeTrace' diff --git a/src/arch/x86/X86System.py b/src/arch/x86/X86System.py index 02185b648..e2ee1b6ec 100644 --- a/src/arch/x86/X86System.py +++ b/src/arch/x86/X86System.py @@ -36,11 +36,12 @@ # Authors: Gabe Black from m5.params import * -from E820 import X86E820Table, X86E820Entry -from SMBios import X86SMBiosSMBiosTable -from IntelMP import X86IntelMPFloatingPointer, X86IntelMPConfigTable -from ACPI import X86ACPIRSDP -from System import System + +from m5.objects.E820 import X86E820Table, X86E820Entry +from m5.objects.SMBios import X86SMBiosSMBiosTable +from m5.objects.IntelMP import X86IntelMPFloatingPointer, X86IntelMPConfigTable +from m5.objects.ACPI import X86ACPIRSDP +from m5.objects.System import System class X86System(System): type = 'X86System' diff --git a/src/arch/x86/X86TLB.py b/src/arch/x86/X86TLB.py index 7f195f233..1b2f63d1d 100644 --- a/src/arch/x86/X86TLB.py +++ b/src/arch/x86/X86TLB.py @@ -38,8 +38,8 @@ from m5.params import * from m5.proxy import * -from BaseTLB import BaseTLB -from MemObject import MemObject +from m5.objects.BaseTLB import BaseTLB +from m5.objects.MemObject import MemObject class X86PagetableWalker(MemObject): type = 'X86PagetableWalker' -- cgit v1.2.3