sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ext: fix SST connector

Browse source 
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.
This commit is contained in:
Curtis Dunham 2015-10-06 18:08:28 -05:00
parent 71b1c6ce76
commit 83e07c07f9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/sst/ExtMaster.cc
View file

@ -165,7 +165,7 @@ ExtMaster::handleEvent(SST::Event* event)
Request::FlagsType flags = 0; Request::FlagsType flags = 0;
if (ev->queryFlag(MemEvent::F_LOCKED)) if (ev->queryFlag(MemEvent::F_LOCKED))
flags |= Request::LOCKED; flags |= Request::LOCKED_RMW;
if (ev->queryFlag(MemEvent::F_NONCACHEABLE)) if (ev->queryFlag(MemEvent::F_NONCACHEABLE))
flags |= Request::UNCACHEABLE; flags |= Request::UNCACHEABLE;
if (ev->isLoadLink()) { if (ev->isLoadLink()) {

4
ext/sst/ExtSlave.cc
View file

@ -126,7 +126,7 @@ ExtSlave::recvTimingReq(PacketPtr pkt)
else if ((::MemCmd::Command)pkt->cmd.toInt() == ::MemCmd::StoreCondReq) else if ((::MemCmd::Command)pkt->cmd.toInt() == ::MemCmd::StoreCondReq)
ev->setStoreConditional(); 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->isUncacheable()) ev->setFlag(MemEvent::F_NONCACHEABLE);
if (pkt->req->hasContextId()) ev->setGroupId(pkt->req->contextId()); if (pkt->req->hasContextId()) ev->setGroupId(pkt->req->contextId());
// Prefetches not working with SST; it maybe be dropping them, treating them // 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 // make Req/Pkt for Snoop/no response needed
// presently no consideration for masterId, packet type, flags... // presently no consideration for masterId, packet type, flags...
RequestPtr req = new Request(event->getAddr(), event->getSize(), 0, 0); 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 // Clear out bus delay notifications
pkt->headerDelay = pkt->payloadDelay = 0; pkt->headerDelay = pkt->payloadDelay = 0;