From 3e7f6604013570f2afb04b1cdbf400b8c2b1fba5 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Wed, 1 Jun 2005 17:08:45 -0400 Subject: A few more config updates. Works with regression now. configs/splash2/run.py: Update file for new config changes. python/m5/config.py: - isParamContext() not defined any more - fix bug with re-assigning vectors over scalars and vice versa --HG-- rename : configs/splash2/run.mpy => configs/splash2/run.py extra : convert_revision : 2eb28a92f8de327f6dfddd01467c61e759275f6b --- python/m5/config.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'python/m5') diff --git a/python/m5/config.py b/python/m5/config.py index 5da1ba934..0aac595b1 100644 --- a/python/m5/config.py +++ b/python/m5/config.py @@ -268,7 +268,7 @@ class MetaSimObject(type): e.args = (msg, ) raise # I would love to get rid of this - elif isSimObject(value) or isSimObjSequence(value) or isParamContext(value): + elif isSimObject(value) or isSimObjSequence(value): cls._values[attr] = value else: raise AttributeError, \ @@ -334,12 +334,15 @@ class SimObject(object): e.args = (msg, ) raise # I would love to get rid of this - elif isSimObject(value) or isSimObjSequence(value) or isParamContext(value): + elif isSimObject(value) or isSimObjSequence(value): pass else: raise AttributeError, "Class %s has no parameter %s" \ % (self.__class__.__name__, attr) + # clear out old child with this name, if any + self.clear_child(attr) + if isSimObject(value): value.set_path(self, attr) elif isSimObjSequence(value): @@ -355,6 +358,16 @@ class SimObject(object): return self raise TypeError, "Non-zero index '%s' to SimObject" % key + # clear out children with given name, even if it's a vector + def clear_child(self, name): + if not self._children.has_key(name): + return + child = self._children[name] + if isinstance(child, SimObjVector): + for i in xrange(len(child)): + del self._children["s%d" % (name, i)] + del self._children[name] + def add_child(self, name, value): self._children[name] = value -- cgit v1.2.3