From 15938e049267d87e4272aa863741e56eba883117 Mon Sep 17 00:00:00 2001 From: Geoffrey Blake Date: Thu, 31 Oct 2013 13:41:13 -0500 Subject: config: Fix handling of parents for simobject vectors SimObjectVector objects did not provide the same interface to the _parent attribute through get_parent() like a normal SimObject. It also handled assigning a _parent incorrectly if objects in a SimObjectVector were changed post-creation, leading to errors later when the simulator tried to execute. This patch fixes these two omissions. --- src/python/m5/params.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/python/m5/params.py') diff --git a/src/python/m5/params.py b/src/python/m5/params.py index 981bb0d37..ff645bb37 100644 --- a/src/python/m5/params.py +++ b/src/python/m5/params.py @@ -247,6 +247,19 @@ class SimObjectVector(VectorParamValue): a.append(v.get_config_as_dict()) return a + # If we are replacing an item in the vector, make sure to set the + # parent reference of the new SimObject to be the same as the parent + # of the SimObject being replaced. Useful to have if we created + # a SimObjectVector of temporary objects that will be modified later in + # configuration scripts. + def __setitem__(self, key, value): + val = self[key] + if value.has_parent(): + warn("SimObject %s already has a parent" % value.get_name() +\ + " that is being overwritten by a SimObjectVector") + value.set_parent(val.get_parent(), val._name) + super(SimObjectVector, self).__setitem__(key, value) + class VectorParamDesc(ParamDesc): # Convert assigned value to appropriate type. If the RHS is not a # list or tuple, it generates a single-element list. -- cgit v1.2.3