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/mips/MipsSystem.py | 2 +- src/arch/mips/MipsTLB.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/arch/mips') diff --git a/src/arch/mips/MipsSystem.py b/src/arch/mips/MipsSystem.py index 58e30f28d..7a5d8fd76 100644 --- a/src/arch/mips/MipsSystem.py +++ b/src/arch/mips/MipsSystem.py @@ -32,7 +32,7 @@ from m5.defines import buildEnv from m5.params import * from m5.proxy import * -from System import System +from m5.objects.System import System class MipsSystem(System): type = 'MipsSystem' diff --git a/src/arch/mips/MipsTLB.py b/src/arch/mips/MipsTLB.py index c43cee717..62996ccab 100644 --- a/src/arch/mips/MipsTLB.py +++ b/src/arch/mips/MipsTLB.py @@ -32,7 +32,7 @@ from m5.SimObject import SimObject from m5.params import * -from BaseTLB import BaseTLB +from m5.objects.BaseTLB import BaseTLB class MipsTLB(BaseTLB): type = 'MipsTLB' -- cgit v1.2.3