summaryrefslogtreecommitdiff
path: root/configs/example
diff options
context:
space:
mode:
authorBrad Beckmann <Brad.Beckmann@amd.com>2010-08-20 11:46:11 -0700
committerBrad Beckmann <Brad.Beckmann@amd.com>2010-08-20 11:46:11 -0700
commit10e25cb1d05bd04e177cfa44a0c529af01acfad8 (patch)
tree5cc47d8b9cbb444bfc171d11998ad16dd7df47ba /configs/example
parent09854be558db4eae912efd3ff3b6ab4d35261c27 (diff)
downloadgem5-10e25cb1d05bd04e177cfa44a0c529af01acfad8.tar.xz
config: Improve ruby simobject names
This patch attaches ruby objects to the system before the topology is created so that their simobject names read their meaningful variable names instead of their topology name.
Diffstat (limited to 'configs/example')
-rw-r--r--configs/example/memtest-ruby.py2
-rw-r--r--configs/example/ruby_fs.py2
-rw-r--r--configs/example/ruby_se.py2
-rw-r--r--configs/example/rubytest.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/configs/example/memtest-ruby.py b/configs/example/memtest-ruby.py
index 567af03d0..d67f300fc 100644
--- a/configs/example/memtest-ruby.py
+++ b/configs/example/memtest-ruby.py
@@ -111,7 +111,7 @@ system = System(cpu = cpus,
funcmem = PhysicalMemory(),
physmem = PhysicalMemory())
-system.ruby = Ruby.create_system(options, system.physmem)
+system.ruby = Ruby.create_system(options, system)
assert(len(cpus) == len(system.ruby.cpu_ruby_ports))
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index b6d9a6c0a..a4ae1c76b 100644
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -113,7 +113,7 @@ CPUClass.clock = options.clock
system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0])
system.ruby = Ruby.create_system(options,
- system.physmem,
+ system,
system.piobus,
system.dma_devices)
diff --git a/configs/example/ruby_se.py b/configs/example/ruby_se.py
index 7a55e1513..a0e839bae 100644
--- a/configs/example/ruby_se.py
+++ b/configs/example/ruby_se.py
@@ -150,7 +150,7 @@ np = options.num_cpus
system = System(cpu = [CPUClass(cpu_id=i) for i in xrange(np)],
physmem = PhysicalMemory())
-system.ruby = Ruby.create_system(options, system.physmem)
+system.ruby = Ruby.create_system(options, system)
assert(options.num_cpus == len(system.ruby.cpu_ruby_ports))
diff --git a/configs/example/rubytest.py b/configs/example/rubytest.py
index 2a789c979..a4daf6b82 100644
--- a/configs/example/rubytest.py
+++ b/configs/example/rubytest.py
@@ -92,7 +92,7 @@ tester = RubyTester(checks_to_complete = options.checks,
#
system = System(physmem = PhysicalMemory())
-system.ruby = Ruby.create_system(options, system.physmem)
+system.ruby = Ruby.create_system(options, system)
assert(options.num_cpus == len(system.ruby.cpu_ruby_ports))