Gabriel B. has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/67662?usp=email )
Change subject: python: Fix namespaced enums params code generation
......................................................................
python: Fix namespaced enums params code generation
The wrapper_name parameter was not properly handled. Enums were always
generated in the enums namespace even if required differently by
wrapper_name.
Change-Id: I366846ce39dfe10effc2cc145e7772a3fd171b92
---
M build_tools/enum_cc.py
M src/python/m5/params.py
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/build_tools/enum_cc.py b/build_tools/enum_cc.py
index 5d82b40..fbf0f51 100644
--- a/build_tools/enum_cc.py
+++ b/build_tools/enum_cc.py
@@ -96,10 +96,8 @@
"""
)
else:
- code(
- """namespace enums
-{"""
- )
+ code('''namespace ${wrapper_name}
+{''')
code.indent(1)
code("const char *${name}Strings[Num_${name}] =")
@@ -112,7 +110,7 @@
if not enum.wrapper_is_struct and not enum.is_class:
code.dedent(1)
- code("} // namespace enums")
+ code('} // namespace ${wrapper_name}')
code("} // namespace gem5")
diff --git a/src/python/m5/params.py b/src/python/m5/params.py
index e76380b..1350d6f 100644
--- a/src/python/m5/params.py
+++ b/src/python/m5/params.py
@@ -1463,8 +1463,8 @@
if cls.is_class:
cls.cxx_type = "%s" % name
else:
- cls.cxx_type = "enums::%s" % name
-
+ scope = init_dict.get('wrapper_name', 'enums')
+ cls.cxx_type = f"{scope}::{name}"
super().__init__(name, bases, init_dict)
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67662?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I366846ce39dfe10effc2cc145e7772a3fd171b92
Gerrit-Change-Number: 67662
Gerrit-PatchSet: 1
Gerrit-Owner: Gabriel B. <gabriel.bus...@arteris.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
