diff options
| author | Malek Musleh <malek.musleh@gmail.com> | 2013-01-14 10:05:14 -0600 |
|---|---|---|
| committer | Malek Musleh <malek.musleh@gmail.com> | 2013-01-14 10:05:14 -0600 |
| commit | 3137557cadf0635c7593a4fb6c37d903d3048c13 (patch) | |
| tree | 178d320ec2c2055dbec418a5531e3464336f571c /configs/ruby/MOESI_CMP_directory.py | |
| parent | 1abf950f3c4ce407c39cb0c86c834b7048181c07 (diff) | |
| download | gem5-3137557cadf0635c7593a4fb6c37d903d3048c13.tar.xz | |
config: move ruby objects under ruby_system in obj hierarchy
This patch moves the contollers to be children of the ruby_system instead of
'system' under the python object hierarchy. This is so that these objects
can inherit some of the ruby_system's parameter values without resorting to
calling a global system pointer during run-time.
Committed by: Nilay Vaish <nilay@cs.wisc.edu>
Diffstat (limited to 'configs/ruby/MOESI_CMP_directory.py')
| -rw-r--r-- | configs/ruby/MOESI_CMP_directory.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configs/ruby/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py index 3a69b657e..bc8bcf8e7 100644 --- a/configs/ruby/MOESI_CMP_directory.py +++ b/configs/ruby/MOESI_CMP_directory.py @@ -106,7 +106,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): if piobus != None: cpu_seq.pio_port = piobus.slave - exec("system.l1_cntrl%d = l1_cntrl" % i) + exec("ruby_system.l1_cntrl%d = l1_cntrl" % i) # # Add controllers and sequencers to the appropriate lists # @@ -130,7 +130,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): L2cacheMemory = l2_cache, ruby_system = ruby_system) - exec("system.l2_cntrl%d = l2_cntrl" % i) + exec("ruby_system.l2_cntrl%d = l2_cntrl" % i) l2_cntrl_nodes.append(l2_cntrl) cntrl_count += 1 @@ -158,7 +158,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): memBuffer = mem_cntrl, ruby_system = ruby_system) - exec("system.dir_cntrl%d = dir_cntrl" % i) + exec("ruby_system.dir_cntrl%d = dir_cntrl" % i) dir_cntrl_nodes.append(dir_cntrl) cntrl_count += 1 @@ -175,8 +175,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system): dma_sequencer = dma_seq, ruby_system = ruby_system) - exec("system.dma_cntrl%d = dma_cntrl" % i) - exec("system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i) + exec("ruby_system.dma_cntrl%d = dma_cntrl" % i) + exec("ruby_system.dma_cntrl%d.dma_sequencer.slave = dma_port" % i) dma_cntrl_nodes.append(dma_cntrl) cntrl_count += 1 |