Merge zizzer:/n/wexford/x/gblack/m5/newmem_bus
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest --HG-- extra : convert_revision : d2d19b27533f35c6570ee84c6c83b2919f27b97f
This commit is contained in:
commit
07dad71f6f
1 changed files with 18 additions and 3 deletions
|
@ -214,9 +214,24 @@ Bus::recvRetry(int id)
|
|||
retryList.front()->sendRetry();
|
||||
// If inRetry is still true, sendTiming wasn't called
|
||||
if (inRetry)
|
||||
panic("Port %s didn't call sendTiming in it's recvRetry\n",\
|
||||
retryList.front()->getPeer()->name());
|
||||
//assert(!inRetry);
|
||||
{
|
||||
retryList.front()->onRetryList(false);
|
||||
retryList.pop_front();
|
||||
inRetry = false;
|
||||
|
||||
//Bring tickNextIdle up to the present
|
||||
while (tickNextIdle < curTick)
|
||||
tickNextIdle += clock;
|
||||
|
||||
//Burn a cycle for the missed grant.
|
||||
tickNextIdle += clock;
|
||||
|
||||
if (!busIdle.scheduled()) {
|
||||
busIdle.schedule(tickNextIdle);
|
||||
} else {
|
||||
busIdle.reschedule(tickNextIdle);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue