109,131d108
< protocol = buildEnv['PROTOCOL']
< exec "import %s" % protocol
< try:
< (cpu_sequencers, dir_cntrls, topology) = \
< eval("%s.create_system(options, system, dma_ports, ruby)"
< % protocol)
< except:
< print "Error: could not create sytem for ruby protocol %s" % protocol
< raise
<
< # Create a port proxy for connecting the system port. This is
< # independent of the protocol and kept in the protocol-agnostic
< # part (i.e. here).
< sys_port_proxy = RubyPortProxy(ruby_system = ruby)
< # Give the system port proxy a SimObject parent without creating a
< # full-fledged controller
< system.sys_port_proxy = sys_port_proxy
<
< # Connect the system port for loading of binaries etc
< system.system_port = system.sys_port_proxy.slave
<
<
< #
133d109
< #
154a131,134
> # Instantiate the network object so that the controllers can connect to it.
> network = NetworkClass(ruby_system = ruby, topology = options.topology,
> routers = [], ext_links = [], int_links = [], netifs = [])
> ruby.network = network
155a136,157
> protocol = buildEnv['PROTOCOL']
> exec "import %s" % protocol
> try:
> (cpu_sequencers, dir_cntrls, topology) = \
> eval("%s.create_system(options, system, dma_ports, ruby)"
> % protocol)
> except:
> print "Error: could not create sytem for ruby protocol %s" % protocol
> raise
>
> # Create a port proxy for connecting the system port. This is
> # independent of the protocol and kept in the protocol-agnostic
> # part (i.e. here).
> sys_port_proxy = RubyPortProxy(ruby_system = ruby)
>
> # Give the system port proxy a SimObject parent without creating a
> # full-fledged controller
> system.sys_port_proxy = sys_port_proxy
>
> # Connect the system port for loading of binaries etc
> system.system_port = system.sys_port_proxy.slave
>
157,158d158
< network = NetworkClass(ruby_system = ruby, topology = topology.description,
< routers = [], ext_links = [], int_links = [], netifs = [])
171d170
< #
178d176
< #
199,200d196
<
< ruby.network = network