163,167d162
< if options.ruby:
< if not (options.cpu_type == "detailed" or options.cpu_type == "timing"):
< print >> sys.stderr, "Ruby requires TimingSimpleCPU or O3CPU!!"
< sys.exit(1)
<
181,184d175
< if options.ruby:
< system.cpu[i].icache_port = system.ruby._cpu_ruby_ports[i].slave
< system.cpu[i].dcache_port = system.ruby._cpu_ruby_ports[i].slave
<
191a183,186
> if not (options.cpu_type == "detailed" or options.cpu_type == "timing"):
> print >> sys.stderr, "Ruby requires TimingSimpleCPU or O3CPU!!"
> sys.exit(1)
>
194a190,202
>
> for i in xrange(np):
> ruby_port = system.ruby._cpu_ruby_ports[i]
>
> # Create the interrupt controller and connect its ports to Ruby
> system.cpu[i].createInterruptController()
> system.cpu[i].interrupts.pio = ruby_port.master
> system.cpu[i].interrupts.int_master = ruby_port.slave
> system.cpu[i].interrupts.int_slave = ruby_port.master
>
> # Connect the cpu's cache ports to Ruby
> system.cpu[i].icache_port = ruby_port.slave
> system.cpu[i].dcache_port = ruby_port.slave
201d208
<