summaryrefslogtreecommitdiff
path: root/src/python/m5
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2009-02-26 19:29:17 -0500
committerAli Saidi <saidi@eecs.umich.edu>2009-02-26 19:29:17 -0500
commit6fd4bc34a154601ba0a74e41875094c20076e091 (patch)
tree21b2a60589d1c509e0c2386a1ebc8385a6e8349d /src/python/m5
parentd5ef9ee06b4e8be52069b46a65af3a0a7e0a9817 (diff)
downloadgem5-6fd4bc34a154601ba0a74e41875094c20076e091.tar.xz
CPA: Add new object for gathering critical path annotations.
Diffstat (limited to 'src/python/m5')
-rw-r--r--src/python/m5/SimObject.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index 1db9c7495..8ef22be4e 100644
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -65,6 +65,7 @@ from params import *
# There are a few things we need that aren't in params.__all__ since
# normal users don't need them
from params import ParamDesc, VectorParamDesc, isNullPointer, SimObjVector
+from proxy import *
noDot = False
try:
@@ -667,7 +668,7 @@ class SimObject(object):
match_obj = self._values[pname]
if found_obj != None and found_obj != match_obj:
raise AttributeError, \
- 'parent.any matched more than one: %s' % obj.path
+ 'parent.any matched more than one: %s and %s' % (found_obj.path, match_obj.path)
found_obj = match_obj
return found_obj, found_obj != None