ruby: handle llsc accesses through CacheEntry, not CacheMemory

[gem5.git] / src / mem / external_slave.cc

diff --git a/src/mem/external_slave.cc b/src/mem/external_slave.cc
index c2ec8e2e4cc65ce84474689f2e14d2e1f1b51181..fadeff83337df8d0633a7b863a59ed971cdce3a7 100644 (file)
--- a/src/mem/external_slave.cc
+++ b/src/mem/external_slave.cc
@@ -80,7 +80,7 @@ class StubSlavePort : public ExternalSlave::Port
     void recvFunctional(PacketPtr packet);
     bool recvTimingReq(PacketPtr packet);
     bool recvTimingSnoopResp(PacketPtr packet);
-    void recvRetry();
+    void recvRespRetry();
     void recvFunctionalSnoop(PacketPtr packet);
 };
 
@@ -108,7 +108,7 @@ StubSlavePort::recvAtomic(PacketPtr packet)
 
         DPRINTF(ExternalPort, "StubSlavePort: recvAtomic a: 0x%x size: %d"
             " data: ...\n", packet->getAddr(), size);
-        DDUMP(ExternalPort, packet->getPtr<uint8_t>(), size);
+        DDUMP(ExternalPort, packet->getConstPtr<uint8_t>(), size);
     }
 
     return 0;
@@ -124,14 +124,14 @@ void
 StubSlavePort::ResponseEvent::process()
 {
     owner.responsePacket->makeResponse();
-    owner.responsePacket->firstWordDelay = 0;
-    owner.responsePacket->lastWordDelay = 0;
+    owner.responsePacket->headerDelay = 0;
+    owner.responsePacket->payloadDelay = 0;
 
     if (owner.sendTimingResp(owner.responsePacket)) {
         owner.responsePacket = NULL;
 
         if (owner.mustRetry)
-            owner.sendRetry();
+            owner.sendRetryReq();
         owner.mustRetry = false;
     }
 }
@@ -161,7 +161,7 @@ StubSlavePort::recvTimingSnoopResp(PacketPtr packet)
 }
 
 void
-StubSlavePort::recvRetry()
+StubSlavePort::recvRespRetry()
 {
     assert(responsePacket);
     /* Stub handles only one response at a time so responseEvent should never