diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2007-03-06 11:13:43 -0800 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2007-03-06 11:13:43 -0800 |
| commit | d55b25cde6d2c072885a2c468d209fb18d6628e6 (patch) | |
| tree | 391c4e66a69818a95037a5f2adccb2e8e0c84648 /configs/common | |
| parent | f800fddcea850822efee031b9b904280639da4c6 (diff) | |
| download | gem5-d55b25cde6d2c072885a2c468d209fb18d6628e6.tar.xz | |
Move all of the parameters of the Root SimObject so they are
directly configured by python. Move stuff from root.(cc|hh) to
core.(cc|hh) since it really belogs there now.
In the process, simplify how ticks are used in the python code.
--HG--
extra : convert_revision : cf82ee1ea20f9343924f30bacc2a38d4edee8df3
Diffstat (limited to 'configs/common')
| -rw-r--r-- | configs/common/FSConfig.py | 1 | ||||
| -rw-r--r-- | configs/common/Simulation.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index da35698f2..be3f5ff79 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -132,5 +132,4 @@ def makeDualRoot(testSystem, driveSystem, dumpfile): self.etherdump = EtherDump(file=dumpfile) self.etherlink.dump = Parent.etherdump - self.clock = '1THz' return self diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py index 8374d2fb5..61b14f026 100644 --- a/configs/common/Simulation.py +++ b/configs/common/Simulation.py @@ -64,7 +64,7 @@ def run(options, root, testsys, cpu_class): if options.maxtick: maxtick = options.maxtick elif options.maxtime: - simtime = int(options.maxtime * root.clock.value) + simtime = m5.ticks.seconds(simtime) print "simulating for: ", simtime maxtick = simtime else: |