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>
This commit is contained in:
@@ -96,7 +96,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
|
||||
#
|
||||
@@ -132,7 +132,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
|
||||
@@ -149,8 +149,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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user