Merge with the main repository again.

diff --cc src/arch/arm/isa/insts/misc.isa
Simple merge

diff --cc src/cpu/BaseCPU.py
index b5c20374298a4f866b5b7c13596977199bec780a,665d42af07ff4eb3b5dac2310b70bf6a29cccdf3..50a8501e2f8f8d58cab119c0c46895d25d66fe08
--- 1/src/cpu/BaseCPU.py
--- 2/src/cpu/BaseCPU.py
+++ b/src/cpu/BaseCPU.py
@@@ -167,15 -181,17 +167,16 @@@ class BaseCPU(MemObject)
          self.icache_port = ic.cpu_side
          self.dcache_port = dc.cpu_side
          self._cached_ports = ['icache.mem_side', 'dcache.mem_side']
-         if buildEnv['TARGET_ISA'] == 'x86' and iwc and dwc:
-             self.itb_walker_cache = iwc
-             self.dtb_walker_cache = dwc
-             self.itb.walker.port = iwc.cpu_side
-             self.dtb.walker.port = dwc.cpu_side
-             self._cached_ports += ["itb_walker_cache.mem_side", \
-                                    "dtb_walker_cache.mem_side"]
-         elif buildEnv['TARGET_ISA'] == 'arm':
-             self._cached_ports += ["itb.walker.port", "dtb.walker.port"]
 -        if buildEnv['FULL_SYSTEM']:
 -            if buildEnv['TARGET_ISA'] in ['x86', 'arm']:
 -                if iwc and dwc:
 -                    self.itb_walker_cache = iwc
 -                    self.dtb_walker_cache = dwc
 -                    self.itb.walker.port = iwc.cpu_side
 -                    self.dtb.walker.port = dwc.cpu_side
 -                    self._cached_ports += ["itb_walker_cache.mem_side", \
 -                                           "dtb_walker_cache.mem_side"]
 -                else:
 -                    self._cached_ports += ["itb.walker.port", "dtb.walker.port"]
++        if buildEnv['TARGET_ISA'] in ['x86', 'arm']:
++            if iwc and dwc:
++                self.itb_walker_cache = iwc
++                self.dtb_walker_cache = dwc
++                self.itb.walker.port = iwc.cpu_side
++                self.dtb.walker.port = dwc.cpu_side
++                self._cached_ports += ["itb_walker_cache.mem_side", \
++                                       "dtb_walker_cache.mem_side"]
++            else:
++                self._cached_ports += ["itb.walker.port", "dtb.walker.port"]
  
      def addTwoLevelCacheHierarchy(self, ic, dc, l2c, iwc = None, dwc = None):
          self.addPrivateSplitL1Caches(ic, dc, iwc, dwc)

diff --cc src/cpu/base.cc
Simple merge

diff --cc src/cpu/o3/O3CPU.py
Simple merge

diff --cc src/cpu/o3/cpu.cc
Simple merge

diff --cc src/cpu/o3/cpu.hh
Simple merge

diff --cc src/dev/io_device.cc
Simple merge

diff --cc src/dev/io_device.hh
Simple merge

diff --cc src/mem/physical.cc
Simple merge

diff --cc src/sim/process.cc
Simple merge