ext: fix SST connector

The renamings in changesets 8f5993cf (2015-03-23) "mem: rename
Locked/LOCKED to LockedRMW/LOCKED_RMW" and fdd4a895 (2015-07-03)
"mem: Split WriteInvalidateReq into write and invalidate" broke the
SST connector.  This commit repeats those renamings in ext/sst.

diff --git a/ext/sst/ExtMaster.cc b/ext/sst/ExtMaster.cc
index d8febbcf13785196e9ebd91cc7657ba84bc76a29..95cbfe7ad39591e14ba3e939a1268bb62241f5e5 100644 (file)
--- a/ext/sst/ExtMaster.cc
+++ b/ext/sst/ExtMaster.cc
@@ -165,7 +165,7 @@ ExtMaster::handleEvent(SST::Event* event)
 
     Request::FlagsType flags = 0;
     if (ev->queryFlag(MemEvent::F_LOCKED))
-        flags |= Request::LOCKED;
+        flags |= Request::LOCKED_RMW;
     if (ev->queryFlag(MemEvent::F_NONCACHEABLE))
         flags |= Request::UNCACHEABLE;
     if (ev->isLoadLink()) {

diff --git a/ext/sst/ExtSlave.cc b/ext/sst/ExtSlave.cc
index 57df21d9285c308fb7f612826c205d22c7cf6323..b98ff2db1d3bc7d8697e913b669931b04998ebd9 100644 (file)
--- a/ext/sst/ExtSlave.cc
+++ b/ext/sst/ExtSlave.cc
@@ -126,7 +126,7 @@ ExtSlave::recvTimingReq(PacketPtr pkt)
     else if ((::MemCmd::Command)pkt->cmd.toInt() == ::MemCmd::StoreCondReq)
         ev->setStoreConditional();
 
-    if (pkt->req->isLocked())      ev->setFlag(MemEvent::F_LOCKED);
+    if (pkt->req->isLockedRMW())      ev->setFlag(MemEvent::F_LOCKED);
     if (pkt->req->isUncacheable()) ev->setFlag(MemEvent::F_NONCACHEABLE);
     if (pkt->req->hasContextId())  ev->setGroupId(pkt->req->contextId());
 // Prefetches not working with SST; it maybe be dropping them, treating them
@@ -184,7 +184,7 @@ ExtSlave::handleEvent(Event* ev)
         // make Req/Pkt for Snoop/no response needed
         // presently no consideration for masterId, packet type, flags...
         RequestPtr req = new Request(event->getAddr(), event->getSize(), 0, 0);
-        auto pkt = new Packet(req, ::MemCmd::InvalidationReq);
+        auto pkt = new Packet(req, ::MemCmd::InvalidateReq);
 
         // Clear out bus delay notifications
         pkt->headerDelay = pkt->payloadDelay = 0;