summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2018-10-03 16:14:41 -0700
committerGabe Black <gabeblack@google.com>2018-10-16 00:48:15 +0000
commit9cd313edf5ab8ca24d80545cd7235c9b19932589 (patch)
tree8b19e68a485da9e95a04f77d41d8c84e1252a35f /src
parent7ddf2336fec1540935ac5771e6fdd50e45473e23 (diff)
downloadgem5-9cd313edf5ab8ca24d80545cd7235c9b19932589.tar.xz
systemc: Change the point where elaboration is considered over.
Make it the end of "before_end_of_elaboration" rather than the end of "end_of_elaboration". This interpretation fits the behavior expected by some of the tests. Change-Id: I3f589147834ab5d5dc8c0e9b4849dd00491c5848 Reviewed-on: https://gem5-review.googlesource.com/c/13287 Reviewed-by: Gabe Black <gabeblack@google.com> Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/systemc/core/kernel.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/systemc/core/kernel.cc b/src/systemc/core/kernel.cc
index 5804f9683..11292c4a5 100644
--- a/src/systemc/core/kernel.cc
+++ b/src/systemc/core/kernel.cc
@@ -82,6 +82,8 @@ Kernel::init()
m->beforeEndOfElaboration();
for (auto c: sc_gem5::allChannels)
c->sc_chan()->before_end_of_elaboration();
+
+ ::sc_gem5::scheduler.elaborationDone(true);
}
void
@@ -106,8 +108,6 @@ Kernel::regStats()
} catch (...) {
::sc_gem5::scheduler.throwToScMain();
}
-
- ::sc_gem5::scheduler.elaborationDone(true);
}
void