diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-05-30 19:45:54 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-05-30 19:45:54 -0400 |
| commit | f0c05de9f98fe3c6e386d3f0346f183ce5abe6c8 (patch) | |
| tree | 15ce09bb61f953960bd77c388e76d63e0ae8b6c5 /src/mem/bridge.hh | |
| parent | e371dc32a94b0c4ffe7192aad634b425b5b43437 (diff) | |
| parent | aa11330ddbb1e579aa241d01d24875cc9d86d5f8 (diff) | |
| download | gem5-f0c05de9f98fe3c6e386d3f0346f183ce5abe6c8.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-py
--HG--
extra : convert_revision : 36640569d33c4410320b8444bb572f408bf5edde
Diffstat (limited to 'src/mem/bridge.hh')
| -rw-r--r-- | src/mem/bridge.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/bridge.hh b/src/mem/bridge.hh index 8a5cbf92a..8c7af562c 100644 --- a/src/mem/bridge.hh +++ b/src/mem/bridge.hh @@ -38,7 +38,6 @@ #include <inttypes.h> #include <queue> - #include "mem/mem_object.hh" #include "mem/packet.hh" #include "mem/port.hh" @@ -77,7 +76,8 @@ class Bridge : public MemObject origSenderState(_pkt->senderState), origSrc(_pkt->getSrc()), expectResponse(_pkt->needsResponse()) { - pkt->senderState = this; + if (!pkt->isResponse()) + pkt->senderState = this; } void fixResponse(Packet *pkt) @@ -146,7 +146,7 @@ class Bridge : public MemObject /** When receiving a retry request from the peer port, pass it to the bridge. */ - virtual Packet* recvRetry(); + virtual void recvRetry(); /** When receiving a Atomic requestfrom the peer port, pass it to the bridge. */ |