From 3137557cadf0635c7593a4fb6c37d903d3048c13 Mon Sep 17 00:00:00 2001 From: Malek Musleh Date: Mon, 14 Jan 2013 10:05:14 -0600 Subject: 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 --- configs/ruby/MOESI_CMP_token.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'configs/ruby/MOESI_CMP_token.py') diff --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py index 5036a5bb2..d805e2e8d 100644 --- a/configs/ruby/MOESI_CMP_token.py +++ b/configs/ruby/MOESI_CMP_token.py @@ -126,7 +126,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 # @@ -151,7 +151,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): N_tokens = n_tokens, 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 @@ -180,7 +180,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system): l2_select_num_bits = l2_bits, 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 @@ -197,8 +197,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 -- cgit v1.2.3