arch-arm,cpu: Introduce a getEMI virtual method on StaticInst.

[gem5.git] / src / mem / AddrMapper.py

diff --git a/src/mem/AddrMapper.py b/src/mem/AddrMapper.py
index 1e8dfea1f48a65a0d6a7f0db8d32ad2b6df2dae0..60ef3bed19fb200de9c715f2b9dc354f2af0075d 100644 (file)
--- a/src/mem/AddrMapper.py
+++ b/src/mem/AddrMapper.py
@@ -37,10 +37,10 @@ from m5.params import *
 from m5.SimObject import SimObject
 
 # An address mapper changes the packet addresses in going from the
-# slave port side of the mapper to the master port side. When the
-# slave port is queried for the address ranges, it also performs the
+# response port side of the mapper to the request port side. When the
+# response port is queried for the address ranges, it also performs the
 # necessary range updates. Note that snoop requests that travel from
-# the master port (i.e. the memory side) to the slave port are
+# the request port (i.e. the memory side) to the response port are
 # currently not modified.
 class AddrMapper(SimObject):
     type = 'AddrMapper'
@@ -48,9 +48,14 @@ class AddrMapper(SimObject):
     abstract = True
 
     # one port in each direction
-    master = MasterPort("Master port")
-    slave = SlavePort("Slave port")
-
+    mem_side_port = RequestPort("This port sends requests and "
+                                "receives responses")
+    master   = DeprecatedParam(mem_side_port,
+                               '`master` is now called `mem_side_port`')
+    cpu_side_port = ResponsePort("This port receives requests and "
+                                 "sends responses")
+    slave    = DeprecatedParam(cpu_side_port,
+                               '`slave` is now called `cpu_side_port`')
 
 # Range address mapper that maps a set of original ranges to a set of
 # remapped ranges, where a specific range is of the same size