diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/SConscript | 4 | ||||
| -rw-r--r-- | python/m5/objects/AlphaConsole.py | 2 | ||||
| -rw-r--r-- | python/m5/objects/BaseCPU.py | 2 | ||||
| -rw-r--r-- | python/m5/objects/System.py (renamed from python/m5/objects/BaseSystem.py) | 3 | ||||
| -rw-r--r-- | python/m5/objects/Tsunami.py | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/python/SConscript b/python/SConscript index 9c15c6d50..7042a58e6 100644 --- a/python/SConscript +++ b/python/SConscript @@ -182,7 +182,7 @@ EmbedMap %(name)s("%(fname)s", # base list of .py files to embed embedded_py_files = [ '../util/pbs/jobfile.py' ] -# add all .py and .mpy files in python/m5 +# add all .py files in python/m5 objpath = os.path.join(env['SRCDIR'], 'python', 'm5') for root, dirs, files in os.walk(objpath, topdown=True): for i,dir in enumerate(dirs): @@ -192,7 +192,7 @@ for root, dirs, files in os.walk(objpath, topdown=True): assert(root.startswith(objpath)) for f in files: - if f.endswith('.mpy') or f.endswith('.py'): + if f.endswith('.py'): embedded_py_files.append(os.path.join(root, f)) embedfile_hh = os.path.join(env['SRCDIR'], 'base/embedfile.hh') diff --git a/python/m5/objects/AlphaConsole.py b/python/m5/objects/AlphaConsole.py index 9fe31b009..32a137bec 100644 --- a/python/m5/objects/AlphaConsole.py +++ b/python/m5/objects/AlphaConsole.py @@ -7,4 +7,4 @@ class AlphaConsole(PioDevice): disk = Param.SimpleDisk("Simple Disk") num_cpus = Param.Int(1, "Number of CPUs") sim_console = Param.SimConsole(Parent.any, "The Simulator Console") - system = Param.BaseSystem(Parent.any, "system object") + system = Param.System(Parent.any, "system object") diff --git a/python/m5/objects/BaseCPU.py b/python/m5/objects/BaseCPU.py index 0dc436434..452b97c84 100644 --- a/python/m5/objects/BaseCPU.py +++ b/python/m5/objects/BaseCPU.py @@ -9,7 +9,7 @@ class BaseCPU(SimObject): dtb = Param.AlphaDTB("Data TLB") itb = Param.AlphaITB("Instruction TLB") mem = Param.FunctionalMemory("memory") - system = Param.BaseSystem(Parent.any, "system object") + system = Param.System(Parent.any, "system object") else: workload = VectorParam.Process("processes to run") diff --git a/python/m5/objects/BaseSystem.py b/python/m5/objects/System.py index 457eadb36..c247983c5 100644 --- a/python/m5/objects/BaseSystem.py +++ b/python/m5/objects/System.py @@ -1,7 +1,6 @@ from m5 import * -class BaseSystem(SimObject): +class System(SimObject): type = 'BaseSystem' - abstract = True boot_cpu_frequency = Param.Frequency(Self.cpu[0].clock.frequency, "boot processor frequency") memctrl = Param.MemoryController(Parent.any, "memory controller") diff --git a/python/m5/objects/Tsunami.py b/python/m5/objects/Tsunami.py index fa3c18127..c8fd94e2c 100644 --- a/python/m5/objects/Tsunami.py +++ b/python/m5/objects/Tsunami.py @@ -5,7 +5,7 @@ from Platform import Platform class Tsunami(Platform): type = 'Tsunami' pciconfig = Param.PciConfigAll("PCI configuration") - system = Param.BaseSystem(Parent.any, "system") + system = Param.System(Parent.any, "system") class TsunamiCChip(FooPioDevice): type = 'TsunamiCChip' |