summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mem/cache/cache_impl.hh7
-rw-r--r--src/mem/packet.hh7
2 files changed, 12 insertions, 2 deletions
diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 2eb38805c..535dc81c2 100644
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -1693,7 +1693,12 @@ Cache<TagStore>::handleSnoop(PacketPtr pkt, BlkType *blk,
}
if (respond) {
- assert(!pkt->memInhibitAsserted());
+ // prevent anyone else from responding, cache as well as
+ // memory, and also prevent any memory from even seeing the
+ // request (with current inhibited semantics), note that this
+ // applies both to reads and writes and that for writes it
+ // works thanks to the fact that we still have dirty data and
+ // will write it back at a later point
pkt->assertMemInhibit();
if (have_exclusive) {
pkt->setSupplyExclusive();
diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index 19423db58..b212de7c8 100644
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -504,7 +504,12 @@ class Packet : public Printable
bool isFlush() const { return cmd.isFlush(); }
// Snoop flags
- void assertMemInhibit() { flags.set(MEM_INHIBIT); }
+ void assertMemInhibit()
+ {
+ assert(isRequest());
+ assert(!flags.isSet(MEM_INHIBIT));
+ flags.set(MEM_INHIBIT);
+ }
bool memInhibitAsserted() const { return flags.isSet(MEM_INHIBIT); }
void assertShared() { flags.set(SHARED); }
bool sharedAsserted() const { return flags.isSet(SHARED); }