diff --git a/configs/splash2/run.mpy b/configs/splash2/run.py similarity index 55% rename from configs/splash2/run.mpy rename to configs/splash2/run.py index 800bff6f8..2ecdf3fc1 100644 --- a/configs/splash2/run.mpy +++ b/configs/splash2/run.py @@ -1,3 +1,32 @@ +# Copyright (c) 2005 The Regents of The University of Michigan +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer; +# redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution; +# neither the name of the copyright holders nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Authors: Ron Dreslinski + +from m5 import * import Splash2 if 'SYSTEM' not in env: 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