Configs: SE script fix for Alpha and Ruby simulations
authorMalek Musleh <malek.musleh@gmail.com>
Fri, 28 Sep 2012 13:35:25 +0000 (09:35 -0400)
committerMalek Musleh <malek.musleh@gmail.com>
Fri, 28 Sep 2012 13:35:25 +0000 (09:35 -0400)
PIO interrupt port is only present for x86. Do not attempt to connect
for other ISAs.

configs/example/se.py

index b60baf0419f20fbb8e34172e425c65a9c0bcf5c2..adebab1e21d942f2951b9e1a558de12886667434 100644 (file)
@@ -190,15 +190,17 @@ if options.ruby:
         ruby_port = system.ruby._cpu_ruby_ports[i]
 
         # Create the interrupt controller and connect its ports to Ruby
+        # Note that the interrupt controller is always present but only
+        # in x86 does it have message ports that need to be connected
         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
         if buildEnv['TARGET_ISA'] == 'x86':
+            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
             system.cpu[i].itb.walker.port = ruby_port.slave
             system.cpu[i].dtb.walker.port = ruby_port.slave
 else: