mem: Do not include snoop-filter latency in crossbar occupancy

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

diff --git a/src/mem/port_proxy.hh b/src/mem/port_proxy.hh
index d6ff4d68d8852903ff0f420d9e271aa664f62771..e9ddeecbf536ccb1c47df44b13a2568cc6f3f5ad 100644 (file)
--- a/src/mem/port_proxy.hh
+++ b/src/mem/port_proxy.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2012 ARM Limited
+ * Copyright (c) 2011-2013 ARM Limited
  * All rights reserved
  *
  * The license below extends only to copyright in the software and shall
@@ -60,7 +60,7 @@
 #define __MEM_PORT_PROXY_HH__
 
 #include "config/the_isa.hh"
-#if THE_ISA != NO_ISA
+#if THE_ISA != NULL_ISA
     #include "arch/isa_traits.hh"
 #endif
 
@@ -86,64 +86,64 @@ class PortProxy
   private:
 
     /** The actual physical port used by this proxy. */
-    Port &_port;
+    MasterPort &_port;
 
-    void blobHelper(Addr addr, uint8_t *p, int size, MemCmd cmd);
+    /** Granularity of any transactions issued through this proxy. */
+    const unsigned int _cacheLineSize;
 
   public:
-    PortProxy(Port &port) : _port(port) { }
+    PortProxy(MasterPort &port, unsigned int cacheLineSize) :
+        _port(port), _cacheLineSize(cacheLineSize) { }
     virtual ~PortProxy() { }
 
     /**
      * Read size bytes memory at address and store in p.
      */
-    virtual void readBlob(Addr addr, uint8_t* p, int size)
-    { blobHelper(addr, p, size, MemCmd::ReadReq); }
+    virtual void readBlob(Addr addr, uint8_t* p, int size) const;
 
     /**
      * Write size bytes from p to address.
      */
-    virtual void writeBlob(Addr addr, uint8_t* p, int size)
-    { blobHelper(addr, p, size, MemCmd::WriteReq); }
+    virtual void writeBlob(Addr addr, const uint8_t* p, int size) const;
 
     /**
      * Fill size bytes starting at addr with byte value val.
      */
-    virtual void memsetBlob(Addr addr, uint8_t v, int size);
+    virtual void memsetBlob(Addr addr, uint8_t v, int size) const;
 
     /**
      * Read sizeof(T) bytes from address and return as object T.
      */
     template <typename T>
-    T read(Addr address);
+    T read(Addr address) const;
 
     /**
      * Write object T to address. Writes sizeof(T) bytes.
      */
     template <typename T>
-    void write(Addr address, T data);
+    void write(Addr address, T data) const;
 
-#if THE_ISA != NO_ISA
+#if THE_ISA != NULL_ISA
     /**
      * Read sizeof(T) bytes from address and return as object T.
      * Performs Guest to Host endianness transform.
      */
     template <typename T>
-    T readGtoH(Addr address);
+    T readGtoH(Addr address) const;
 
     /**
      * Write object T to address. Writes sizeof(T) bytes.
      * Performs Host to Guest endianness transform.
      */
     template <typename T>
-    void writeHtoG(Addr address, T data);
+    void writeHtoG(Addr address, T data) const;
 #endif
 };
 
 
 template <typename T>
 T
-PortProxy::read(Addr address)
+PortProxy::read(Addr address) const
 {
     T data;
     readBlob(address, (uint8_t*)&data, sizeof(T));
@@ -152,15 +152,15 @@ PortProxy::read(Addr address)
 
 template <typename T>
 void
-PortProxy::write(Addr address, T data)
+PortProxy::write(Addr address, T data) const
 {
     writeBlob(address, (uint8_t*)&data, sizeof(T));
 }
 
-#if THE_ISA != NO_ISA
+#if THE_ISA != NULL_ISA
 template <typename T>
 T
-PortProxy::readGtoH(Addr address)
+PortProxy::readGtoH(Addr address) const
 {
     T data;
     readBlob(address, (uint8_t*)&data, sizeof(T));
@@ -169,7 +169,7 @@ PortProxy::readGtoH(Addr address)
 
 template <typename T>
 void
-PortProxy::writeHtoG(Addr address, T data)
+PortProxy::writeHtoG(Addr address, T data) const
 {
     data = TheISA::htog(data);
     writeBlob(address, (uint8_t*)&data, sizeof(T));