diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2005-03-16 23:10:22 -0500 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2005-03-16 23:10:22 -0500 |
commit | 8b9e38c303a50b773a0b4d6d4e04ebba53ce0d72 (patch) | |
tree | 9e8add9d3c2bfb37d11359ace5cb6e508b0a902a /python/m5/config.py | |
parent | ab5eb7d455f0c1bb0a324f97f442d351b6f0f57b (diff) | |
parent | 090301366974386da75fe806a346d3ff953e1e2d (diff) | |
download | gem5-8b9e38c303a50b773a0b4d6d4e04ebba53ce0d72.tar.xz |
Merge zizzer.eecs.umich.edu:/z/stever/bk/m5-head
into zizzer.eecs.umich.edu:/z/stever/bk/m5-py
--HG--
extra : convert_revision : 39f30bd052c0f2b88524311d674bad7a0fae6358
Diffstat (limited to 'python/m5/config.py')
-rw-r--r-- | python/m5/config.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/python/m5/config.py b/python/m5/config.py index 5da3da19d..712b0cfd1 100644 --- a/python/m5/config.py +++ b/python/m5/config.py @@ -198,12 +198,13 @@ class Proxy(object): raise AttributeError, \ 'Parent of %s type %s not found at path %s' \ % (base.name, ptype, self._path) - found, done = obj.find(ptype, self._path) - if isinstance(found, Proxy): - done = False + result, done = obj.find(ptype, self._path) obj = obj.parent - return self._mulcheck(found) + if isinstance(result, Proxy): + result = result.unproxy(obj, ptype) + + return self._mulcheck(result) def getindex(obj, index): if index == None: |