Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/12438 )
Change subject: systemc: Make sure children of processes are recorded as
such.
......................................................................
systemc: Make sure children of processes are recorded as such.
The process was treated as the parent of the object, but the object
wasn't being installed as a child of the process.
Change-Id: I6710f34734835cbeceb3d33e5e37b6f5897c5e30
Reviewed-on: https://gem5-review.googlesource.com/c/12438
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/systemc/core/object.cc
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
diff --git a/src/systemc/core/object.cc b/src/systemc/core/object.cc
index 1fb1d45..b97fd90 100644
--- a/src/systemc/core/object.cc
+++ b/src/systemc/core/object.cc
@@ -91,10 +91,12 @@
// We're "within" a parent module, ie we're being created while its
// constructor or end_of_elaboration callback is running.
parent = p->obj()->_sc_obj;
- addObject(&parent->_gem5_object->children, _sc_obj);
} else if (scheduler.current()) {
// Our parent is the currently running process.
parent = scheduler.current();
+ }
+ if (parent) {
+ addObject(&parent->_gem5_object->children, _sc_obj);
} else {
// We're a top level object.
addObject(&topLevelObjects, _sc_obj);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12438
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I6710f34734835cbeceb3d33e5e37b6f5897c5e30
Gerrit-Change-Number: 12438
Gerrit-PatchSet: 7
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matthias Jung <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
