summaryrefslogtreecommitdiff
path: root/src/mem/bridge.cc
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-11-16 14:41:56 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-11-16 14:41:56 -0500
commit14ebaa1eccff4032d59147783e98e07b81b5f1ae (patch)
tree4c738d02f4876cb394d0f9510d08380a6f5384c1 /src/mem/bridge.cc
parentac2c7967f69e3ffd29a1ed04a15838073dc060de (diff)
parentdbdf2f14ae6b586efd31b73aa4548a38ecee263f (diff)
downloadgem5-14ebaa1eccff4032d59147783e98e07b81b5f1ae.tar.xz
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zower.eecs.umich.edu:/home/gblack/m5/newmemmemops --HG-- extra : convert_revision : c49b760eac758dbde30867cb638fcb3b790f4721
Diffstat (limited to 'src/mem/bridge.cc')
-rw-r--r--src/mem/bridge.cc12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/mem/bridge.cc b/src/mem/bridge.cc
index 38dcfd2e8..b787f79ca 100644
--- a/src/mem/bridge.cc
+++ b/src/mem/bridge.cc
@@ -91,10 +91,16 @@ Bridge::init()
bool
Bridge::BridgePort::recvTiming(PacketPtr pkt)
{
- DPRINTF(BusBridge, "recvTiming: src %d dest %d addr 0x%x\n",
- pkt->getSrc(), pkt->getDest(), pkt->getAddr());
+ if (pkt->flags & SNOOP_COMMIT) {
+ DPRINTF(BusBridge, "recvTiming: src %d dest %d addr 0x%x\n",
+ pkt->getSrc(), pkt->getDest(), pkt->getAddr());
- return otherPort->queueForSendTiming(pkt);
+ return otherPort->queueForSendTiming(pkt);
+ }
+ else {
+ // Else it's just a snoop, properly return if we are blocking
+ return !queueFull();
+ }
}