sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge zizzer:/n/wexford/x/gblack/m5/newmem_bus

Browse source 
into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest

--HG--
extra : convert_revision : 70187b8f04d0f8424512f64bdade05bf1aca85a3
This commit is contained in:
Ron Dreslinski 2006-10-11 01:02:18 -04:00
commit 4e35c5656f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mem/bus.cc
View file

@ -206,8 +206,8 @@ void
Bus::recvRetry(int id) Bus::recvRetry(int id)
{ {
DPRINTF(Bus, "Received a retry\n"); DPRINTF(Bus, "Received a retry\n");
// If there's anything waiting... // If there's anything waiting, and the bus isn't busy...
if (retryList.size()) { if (retryList.size() && curTick >= tickNextIdle) {
//retryingPort = retryList.front(); //retryingPort = retryList.front();
inRetry = true; inRetry = true;
DPRINTF(Bus, "Sending a retry\n"); DPRINTF(Bus, "Sending a retry\n");