summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCurtis Dunham <Curtis.Dunham@arm.com>2015-10-06 18:08:28 -0500
committerCurtis Dunham <Curtis.Dunham@arm.com>2015-10-06 18:08:28 -0500
commit83e07c07f941ab496fa9cfef4807719a16b51066 (patch)
treece804bc0deaa274fb4bcbf3f6c9558be31e3e7e8
parent71b1c6ce762260d023a799cc861ac6bfc8483c1e (diff)
downloadgem5-83e07c07f941ab496fa9cfef4807719a16b51066.tar.xz
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.
-rw-r--r--ext/sst/ExtMaster.cc2
-rw-r--r--ext/sst/ExtSlave.cc4
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/sst/ExtMaster.cc b/ext/sst/ExtMaster.cc
index d8febbcf1..95cbfe7ad 100644
--- 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 57df21d92..b98ff2db1 100644
--- 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;