diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-11-16 14:42:44 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-11-16 14:42:44 -0500 |
| commit | 74654ddd1f2233ab26c95d12f0fa73b7bb0f7c90 (patch) | |
| tree | 44d9fc2d4fb84d45447df0d927111b2e6e3bacff /src/mem/bridge.cc | |
| parent | cd5b33b9ff4016427fa93655f4bbd9030c4f5612 (diff) | |
| parent | 14ebaa1eccff4032d59147783e98e07b81b5f1ae (diff) | |
| download | gem5-74654ddd1f2233ab26c95d12f0fa73b7bb0f7c90.tar.xz | |
Merge zower.eecs.umich.edu:/home/gblack/m5/newmemmemops
into zower.eecs.umich.edu:/eecshome/m5/newmem
--HG--
extra : convert_revision : 74b2352b8f088e38cd1ecf3a8233b45df0476d93
Diffstat (limited to 'src/mem/bridge.cc')
| -rw-r--r-- | src/mem/bridge.cc | 12 |
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(); + } } |