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

cpu: Fix drain issues in the Minor CPU

Browse source 
The drain refactor patches introduced a couple of bugs in the way
Minor handles draining. This patch fixes an incorrect assert and a
case of infinite recursion when the CPU signals drain done.
This commit is contained in:
Andreas Sandberg 2015-07-30 10:15:50 +01:00
parent d8f732273e
commit 473a0dcc63
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cpu/minor/cpu.cc
View file

@ -213,14 +213,12 @@ void
MinorCPU::signalDrainDone() MinorCPU::signalDrainDone()
{ {
DPRINTF(Drain, "MinorCPU drain done\n"); DPRINTF(Drain, "MinorCPU drain done\n");
signalDrainDone(); Drainable::signalDrainDone();
} }
void void
MinorCPU::drainResume() MinorCPU::drainResume()
{ {
assert(drainState() == DrainState::Drained);
if (switchedOut()) { if (switchedOut()) {
DPRINTF(Drain, "drainResume while switched out. Ignoring\n"); DPRINTF(Drain, "drainResume while switched out. Ignoring\n");
return; return;