sparc,sim: Remove special handling of SPARC in the clone system call.

[gem5.git] / src / mem / mem_checker_monitor.hh

diff --git a/src/mem/mem_checker_monitor.hh b/src/mem/mem_checker_monitor.hh
index c2fb80d59807d2235aac4dac0f85ea393242c086..8e5dab1a26eaf9797c2c5261df108df224fff080 100644 (file)
--- a/src/mem/mem_checker_monitor.hh
+++ b/src/mem/mem_checker_monitor.hh
@@ -83,17 +83,17 @@ class MemCheckerMonitor : public SimObject
     };
 
     /**
-     * This is the master port of the communication monitor. All recv
+     * This is the request port of the communication monitor. All recv
      * functions call a function in MemCheckerMonitor, where the
-     * send function of the slave port is called. Besides this, these
+     * send function of the response port is called. Besides this, these
      * functions can also perform actions for capturing statistics.
      */
-    class MonitorMasterPort : public RequestPort
+    class MonitorRequestPort : public RequestPort
     {
 
       public:
 
-        MonitorMasterPort(const std::string& _name, MemCheckerMonitor& _mon)
+        MonitorRequestPort(const std::string& _name, MemCheckerMonitor& _mon)
             : RequestPort(_name, &_mon), mon(_mon)
         { }
 
@@ -140,21 +140,21 @@ class MemCheckerMonitor : public SimObject
 
     };
 
-    /** Instance of master port, facing the memory side */
-    MonitorMasterPort masterPort;
+    /** Instance of request port, facing the memory side */
+    MonitorRequestPort memSidePort;
 
     /**
-     * This is the slave port of the communication monitor. All recv
+     * This is the response port of the communication monitor. All recv
      * functions call a function in MemCheckerMonitor, where the
-     * send function of the master port is called. Besides this, these
+     * send function of the request port is called. Besides this, these
      * functions can also perform actions for capturing statistics.
      */
-    class MonitorSlavePort : public ResponsePort
+    class MonitorResponsePort : public ResponsePort
     {
 
       public:
 
-        MonitorSlavePort(const std::string& _name, MemCheckerMonitor& _mon)
+        MonitorResponsePort(const std::string& _name, MemCheckerMonitor& _mon)
             : ResponsePort(_name, &_mon), mon(_mon)
         { }
 
@@ -196,8 +196,8 @@ class MemCheckerMonitor : public SimObject
 
     };
 
-    /** Instance of slave port, i.e. on the CPU side */
-    MonitorSlavePort slavePort;
+    /** Instance of response port, i.e. on the CPU side */
+    MonitorResponsePort cpuSidePort;
 
     void recvFunctional(PacketPtr pkt);