diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-01-25 14:26:21 +0000 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-02-12 09:43:00 +0000 |
| commit | ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa (patch) | |
| tree | c672aa096c0088820c7ffa341b2d603cef6f66d6 /src/dev/alpha | |
| parent | 9fbfb45e51e657b364334a1c96ba23698d181edb (diff) | |
| download | gem5-ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa.tar.xz | |
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 <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15981
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Diffstat (limited to 'src/dev/alpha')
| -rw-r--r-- | src/dev/alpha/AlphaBackdoor.py | 3 | ||||
| -rw-r--r-- | src/dev/alpha/Tsunami.py | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/dev/alpha/AlphaBackdoor.py b/src/dev/alpha/AlphaBackdoor.py index 29372bce8..6355269fc 100644 --- a/src/dev/alpha/AlphaBackdoor.py +++ b/src/dev/alpha/AlphaBackdoor.py @@ -29,7 +29,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 AlphaBackdoor(BasicPioDevice): type = 'AlphaBackdoor' diff --git a/src/dev/alpha/Tsunami.py b/src/dev/alpha/Tsunami.py index f807e946f..e5b8885ad 100644 --- a/src/dev/alpha/Tsunami.py +++ b/src/dev/alpha/Tsunami.py @@ -28,12 +28,12 @@ from m5.params import * from m5.proxy import * -from BadDevice import BadDevice -from AlphaBackdoor import AlphaBackdoor -from Device import BasicPioDevice, IsaFake, BadAddr -from PciHost import GenericPciHost -from Platform import Platform -from Uart import Uart8250 +from m5.objects.BadDevice import BadDevice +from m5.objects.AlphaBackdoor import AlphaBackdoor +from m5.objects.Device import BasicPioDevice, IsaFake, BadAddr +from m5.objects.PciHost import GenericPciHost +from m5.objects.Platform import Platform +from m5.objects.Uart import Uart8250 class TsunamiCChip(BasicPioDevice): type = 'TsunamiCChip' |