148c148
< bool is_inhibited = pkt->memInhibitAsserted();
---
> bool cache_responding = pkt->cacheResponding();
150,151c150,151
< // and the inhibited flag should always be the same
< assert(is_express_snoop == is_inhibited);
---
> // and the cache responding flag should always be the same
> assert(is_express_snoop == cache_responding);
239,240c239,242
< // remember if the packet will generate a snoop response
< const bool expect_snoop_resp = !is_inhibited && pkt->memInhibitAsserted();
---
> // remember if the packet will generate a snoop response by
> // checking if a cache set the cacheResponding flag during the
> // snooping above
> const bool expect_snoop_resp = !cache_responding && pkt->cacheResponding();
242c244
< !pkt->memInhibitAsserted();
---
> !pkt->cacheResponding();
254,255c256
< // express snoops and inhibited packets should never be forced
< // to retry
---
> // express snoops should never be forced to retry
257d257
< assert(!pkt->memInhibitAsserted());
389,390c389,391
< // remeber if the packet is inhibited so we can see if it changes
< const bool is_inhibited = pkt->memInhibitAsserted();
---
> // remember if a cache has already committed to responding so we
> // can see if it changes during the snooping
> const bool cache_responding = pkt->cacheResponding();
417c418
< if (!is_inhibited && pkt->memInhibitAsserted()) {
---
> if (!cache_responding && pkt->cacheResponding()) {
763c764
< assert(pkt->memInhibitAsserted());
---
> assert(pkt->cacheResponding());