summaryrefslogtreecommitdiff
path: root/src/python/m5
diff options
context:
space:
mode:
Diffstat (limited to 'src/python/m5')
-rw-r--r--src/python/m5/SimObject.py16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/python/m5/SimObject.py b/src/python/m5/SimObject.py
index e051a972b..0c9e738f6 100644
--- a/src/python/m5/SimObject.py
+++ b/src/python/m5/SimObject.py
@@ -407,6 +407,7 @@ class MetaSimObject(type):
'cxx_type' : str,
'cxx_header' : str,
'type' : str,
+ 'cxx_base' : (str, type(None)),
'cxx_extra_bases' : list,
'cxx_exports' : list,
'cxx_param_exports' : list,
@@ -734,8 +735,19 @@ module_init(py::module &m_internal)
code()
code.dedent()
- bases = [ cls._base.cxx_class ] + cls.cxx_extra_bases if \
- cls._base else cls.cxx_extra_bases
+ bases = []
+ if 'cxx_base' in cls._value_dict:
+ # If the c++ base class implied by python inheritance was
+ # overridden, use that value.
+ if cls.cxx_base:
+ bases.append(cls.cxx_base)
+ elif cls._base:
+ # If not and if there was a SimObject base, use its c++ class
+ # as this class' base.
+ bases.append(cls._base.cxx_class)
+ # Add in any extra bases that were requested.
+ bases.extend(cls.cxx_extra_bases)
+
if bases:
base_str = ", ".join(bases)
code('py::class_<${{cls.cxx_class}}, ${base_str}, ' \