X86: Loosen an assert for x86 and connect the APIC ports when caches are used.

diff --git a/src/cpu/BaseCPU.py b/src/cpu/BaseCPU.py
index 402831f5ad7d154746b810a1415308eee9bea0f2..868f4701593c7563d623edf0ba3d81fcde9a1264 100644 (file)
--- a/src/cpu/BaseCPU.py
+++ b/src/cpu/BaseCPU.py
@@ -167,7 +167,7 @@ class BaseCPU(MemObject):
                 exec('self.%s = bus.port' % p)
 
     def addPrivateSplitL1Caches(self, ic, dc):
-        assert(len(self._mem_ports) < 6)
+        assert(len(self._mem_ports) < 8)
         self.icache = ic
         self.dcache = dc
         self.icache_port = ic.cpu_side
@@ -176,6 +176,8 @@ class BaseCPU(MemObject):
         if buildEnv['FULL_SYSTEM']:
             if buildEnv['TARGET_ISA'] in ['x86', 'arm']:
                 self._mem_ports += ["itb.walker.port", "dtb.walker.port"]
+            if buildEnv['TARGET_ISA'] == 'x86':
+                self._mem_ports += ["interrupts.pio", "interrupts.int_port"]
 
     def addTwoLevelCacheHierarchy(self, ic, dc, l2c):
         self.addPrivateSplitL1Caches(ic, dc)