summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Beckmann <Brad.Beckmann@amd.com>2010-08-24 13:20:32 -0700
committerBrad Beckmann <Brad.Beckmann@amd.com>2010-08-24 13:20:32 -0700
commit0e610290d0845f0ccbe8f2f675b40e11f62c0f88 (patch)
tree6df63737dc071cc6ea6841a53adf75ec2452b134
parent8572d8fd9190884dc70e9db60f80e4778f65c44b (diff)
downloadgem5-0e610290d0845f0ccbe8f2f675b40e11f62c0f88.tar.xz
config: remove ruby's requirement on the timing cmd line param
Since ruby only works in timing mode, explicitly requiring the timing cmd line param to be specified is not necessary.
-rw-r--r--configs/example/ruby_fs.py1
-rw-r--r--configs/example/ruby_se.py8
2 files changed, 3 insertions, 6 deletions
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index 017b24d9d..4dd1364c7 100644
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -103,7 +103,6 @@ else:
# fast forward with the atomic cpu and instead set the FutureClass to None.
# Therefore the cpus resolve to the correct names and unserialize correctly.
#
-assert(options.timing)
class CPUClass(TimingSimpleCPU): pass
test_mem_mode = 'timing'
FutureClass = None
diff --git a/configs/example/ruby_se.py b/configs/example/ruby_se.py
index d51f92f19..9c440c9cd 100644
--- a/configs/example/ruby_se.py
+++ b/configs/example/ruby_se.py
@@ -134,14 +134,12 @@ if options.detailed:
process += [smt_process, ]
smt_idx += 1
-(CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
-
#
# Currently ruby only works in timing mode
#
-assert(options.timing)
-assert(test_mem_mode == 'timing')
-assert(FutureClass == None)
+class CPUClass(TimingSimpleCPU): pass
+test_mem_mode = 'timing'
+FutureClass = None
CPUClass.clock = options.clock