1c1
< # Copyright (c) 2017-2018 ARM Limited
---
> # Copyright (c) 2017-2019 ARM Limited
657a658,660
> if attr == 'pybind_class':
> return '_COLONS_'.join(cls.cxx_class_path)
>
664,665c667,671
< raise AttributeError(
< "object '%s' has no attribute '%s'" % (cls.__name__, attr))
---
> try:
> return getattr(cls.getCCClass(), attr)
> except AttributeError:
> raise AttributeError(
> "object '%s' has no attribute '%s'" % (cls.__name__, attr))
669a676,678
> def getCCClass(cls):
> return getattr(m5.internal.params, cls.pybind_class)
>
678,681c687
< class_path = cls.cxx_class.split('::')
< namespaces, classname = class_path[:-1], class_path[-1]
< py_class_name = '_COLONS_'.join(class_path) if namespaces else \
< classname;
---
> py_class_name = cls.pybind_class
954a961
> static = kwargs.get("static", False)
971c978
< ccobj = self.getCCObject()
---
> ccobj = self.getCCClass() if static else self.getCCObject()
980c987,988
< return_value_policy=return_value_policy)
---
> return_value_policy=return_value_policy,
> static=static)