changeset a84eecaaa866 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=a84eecaaa866
description:
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.
diffstat:
ext/sst/ExtMaster.cc | 2 +-
ext/sst/ExtSlave.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diffs (33 lines):
diff -r bc07f3764129 -r a84eecaaa866 ext/sst/ExtMaster.cc
--- a/ext/sst/ExtMaster.cc Wed Sep 02 13:34:19 2015 -0500
+++ b/ext/sst/ExtMaster.cc Tue Oct 06 18:08:28 2015 -0500
@@ -165,7 +165,7 @@
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 -r bc07f3764129 -r a84eecaaa866 ext/sst/ExtSlave.cc
--- a/ext/sst/ExtSlave.cc Wed Sep 02 13:34:19 2015 -0500
+++ b/ext/sst/ExtSlave.cc Tue Oct 06 18:08:28 2015 -0500
@@ -126,7 +126,7 @@
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 @@
// 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;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
