summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2014-10-29 23:18:26 -0500
committerAli Saidi <Ali.Saidi@ARM.com>2014-10-29 23:18:26 -0500
commitb31d9e93e2744b044d7ccc2d9113bc367038e14f (patch)
tree7ca7fd7caabb154373af00c762886d8e149a4506 /src/arch
parentbaf88e908d285191c13b5e96c16065957e5af7a6 (diff)
downloadgem5-b31d9e93e2744b044d7ccc2d9113bc367038e14f.tar.xz
arm, mem: Fix drain bug and provide drain prints for more components.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm/table_walker.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index ed669919c..adff57fdf 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -388,7 +388,6 @@ TableWalker::processWalkWrapper()
// if we've still got pending translations schedule more work
nextWalk(tc);
currState = NULL;
- completeDrain();
}
Fault
@@ -1677,7 +1676,6 @@ TableWalker::doL1DescriptorWrapper()
doL1Descriptor();
stateQueues[L1].pop_front();
- completeDrain();
// Check if fault was generated
if (currState->fault != NoFault) {
currState->transState->finish(currState->fault, currState->req,
@@ -1745,7 +1743,6 @@ TableWalker::doL2DescriptorWrapper()
stateQueues[L2].pop_front();
- completeDrain();
pending = false;
nextWalk(currState->tc);
@@ -1844,6 +1841,8 @@ TableWalker::nextWalk(ThreadContext *tc)
{
if (pendingQueue.size())
schedule(doProcessEvent, clockEdge(Cycles(1)));
+ else
+ completeDrain();
}
bool