diff options
author | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-08 18:49:30 -0400 |
---|---|---|
committer | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-08 18:49:30 -0400 |
commit | 8a539a774ff3ae701e2aa4daae96b5d988c74409 (patch) | |
tree | 491f82732805b0e745ac3d4d1ceb11bcf764e47c /src/mem/bus.hh | |
parent | 5df93cc1cd5ce8272032ad1cbf5265b5fdb4713f (diff) | |
parent | 1345183a89a148bf48110c4559448dd708549252 (diff) | |
download | gem5-8a539a774ff3ae701e2aa4daae96b5d988c74409.tar.xz |
Merge zizzer:/z/m5/Bitkeeper/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest
--HG--
extra : convert_revision : f3067efb7f3ff30158d541dfc52de4ea8edae576
Diffstat (limited to 'src/mem/bus.hh')
-rw-r--r-- | src/mem/bus.hh | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/mem/bus.hh b/src/mem/bus.hh index 941389296..3d7f4ad65 100644 --- a/src/mem/bus.hh +++ b/src/mem/bus.hh @@ -62,9 +62,6 @@ class Bus : public MemObject AddrRangeList defaultRange; std::vector<DevMap> portSnoopList; - std::vector<int> snoopCallbacks; - - /** Function called by the port when the bus is recieving a Timing transaction.*/ bool recvTiming(Packet *pkt); @@ -105,16 +102,11 @@ class Bus : public MemObject /** Snoop all relevant ports atomicly. */ void atomicSnoop(Packet *pkt); - /** Snoop for NACK and Blocked in phase 1 + /** Call snoop on caches, be sure to set SNOOP_COMMIT bit if you want + * the snoop to happen * @return True if succeds. */ - bool timingSnoopPhase1(Packet *pkt); - - /** @todo Don't need to commit all snoops just those that need it - *(register somehow). */ - /** Commit all snoops now that we know if any of them would have blocked. - */ - void timingSnoopPhase2(Packet *pkt); + bool timingSnoop(Packet *pkt); /** Process address range request. * @param resp addresses that we can respond to |