summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2018-05-02 14:06:35 +0100
committerAndreas Sandberg <andreas.sandberg@arm.com>2018-06-28 17:40:26 +0000
commit055a6ec3da7df5fee98d8f5ba08aaf81d5e7862c (patch)
tree3429b5883ad20c5d305acff84efe262350191303
parentdce0cba9948f79e6202894c84c20900eb191af0e (diff)
downloadgem5-055a6ec3da7df5fee98d8f5ba08aaf81d5e7862c.tar.xz
python: Fix call bug in @cxxMethod when override is True
Change-Id: Ifa9efbd329fd01eb13100bc6690e651df2c12294 Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-by: Javier Setoain <javier.setoain@arm.com> Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Reviewed-on: https://gem5-review.googlesource.com/11514 Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Jason Lowe-Power <jason@lowepower.com>
-rw-r--r--src/python/m5/SimObject.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index 47e647467..0a5436f5b 100644
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -898,7 +898,7 @@ def cxxMethod(*args, **kwargs):
@wraps(func)
def py_call(self, *args, **kwargs):
- return self.func(*args, **kwargs)
+ return func(self, *args, **kwargs)
f = py_call if override else cxx_call
f.__pybind = PyBindMethod(name, cxx_name=cxx_name, args=args)