changeset 369861e3d5af in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=369861e3d5af
description:
cpu: Fix drain issues in the Minor CPU
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.
diffstat:
src/cpu/minor/cpu.cc | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diffs (19 lines):
diff -r 412eb87b1cfc -r 369861e3d5af src/cpu/minor/cpu.cc
--- a/src/cpu/minor/cpu.cc Thu Jul 30 03:42:27 2015 -0400
+++ b/src/cpu/minor/cpu.cc Thu Jul 30 10:15:50 2015 +0100
@@ -213,14 +213,12 @@
MinorCPU::signalDrainDone()
{
DPRINTF(Drain, "MinorCPU drain done\n");
- signalDrainDone();
+ Drainable::signalDrainDone();
}
void
MinorCPU::drainResume()
{
- assert(drainState() == DrainState::Drained);
-
if (switchedOut()) {
DPRINTF(Drain, "drainResume while switched out. Ignoring\n");
return;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
