diff options
| author | Nilay Vaish <nilay@cs.wisc.edu> | 2012-04-05 11:09:19 -0500 |
|---|---|---|
| committer | Nilay Vaish <nilay@cs.wisc.edu> | 2012-04-05 11:09:19 -0500 |
| commit | 4f4a710457af4a9c8e72632995b55f106110ac9c (patch) | |
| tree | 816cc9af7167d0d016df34768fdf701ea5d3a140 /configs/ruby/Ruby.py | |
| parent | f1a60906132fb816f80917d830b34df5e5d87ad4 (diff) | |
| download | gem5-4f4a710457af4a9c8e72632995b55f106110ac9c.tar.xz | |
Config: corrects the way Ruby attaches to the DMA ports
With recent changes to the memory system, a port cannot be assigned a peer
port twice. While making use of the Ruby memory system in FS mode, DMA
ports were assigned peer twice, once for the classic memory system
and once for the Ruby memory system. This patch removes this double
assignment of peer ports.
Diffstat (limited to 'configs/ruby/Ruby.py')
| -rw-r--r-- | configs/ruby/Ruby.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index c9788b0a0..1911a1eb7 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -76,7 +76,7 @@ def define_options(parser): exec "import %s" % protocol eval("%s.define_options(parser)" % protocol) -def create_system(options, system, piobus = None, dma_devices = []): +def create_system(options, system, piobus = None, dma_ports = []): system.ruby = RubySystem(clock = options.clock, stats_filename = options.ruby_stats, @@ -87,8 +87,7 @@ def create_system(options, system, piobus = None, dma_devices = []): exec "import %s" % protocol try: (cpu_sequencers, dir_cntrls, all_cntrls) = \ - eval("%s.create_system(options, system, piobus, \ - dma_devices, ruby)" \ + eval("%s.create_system(options, system, piobus, dma_ports, ruby)" % protocol) except: print "Error: could not create sytem for ruby protocol %s" % protocol |