diff options
author | Nathan Binkert <nate@binkert.org> | 2011-02-16 10:57:04 -0500 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2011-02-16 10:57:04 -0500 |
commit | e3d8d43b176d3a1eb69a5e5d16469d42292e514a (patch) | |
tree | edb7203cec174b20363dc8d698e860076cc1c79c /configs/example/ruby_fs.py | |
parent | dfd4f6ad9395650f39057ceff8a6bf4d92408bfc (diff) | |
parent | 9836972a13576bcc7e9bfdf1e61b1d71ecb01cb7 (diff) | |
download | gem5-e3d8d43b176d3a1eb69a5e5d16469d42292e514a.tar.xz |
merge alpha system files into tree
Diffstat (limited to 'configs/example/ruby_fs.py')
-rw-r--r-- | configs/example/ruby_fs.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py index adc8e6147..2081a10c4 100644 --- a/configs/example/ruby_fs.py +++ b/configs/example/ruby_fs.py @@ -111,19 +111,17 @@ CPUClass.clock = options.clock if buildEnv['TARGET_ISA'] == "alpha": system = makeLinuxAlphaRubySystem(test_mem_mode, bm[0]) - system.ruby = Ruby.create_system(options, - system, - system.piobus, - system.dma_devices) elif buildEnv['TARGET_ISA'] == "x86": system = makeLinuxX86System(test_mem_mode, options.num_cpus, bm[0], True) setWorkCountOptions(system, options) - system.ruby = Ruby.create_system(options, - system, - system.piobus) else: fatal("incapable of building non-alpha or non-x86 full system!") +system.ruby = Ruby.create_system(options, + system, + system.piobus, + system._dma_devices) + system.cpu = [CPUClass(cpu_id=i) for i in xrange(options.num_cpus)] for (i, cpu) in enumerate(system.cpu): |