Include OMR build flags in DDR macros

Change DDR getmacros script to pick up undef'd flags commented out by configure. Treat omrcfg.h as containing both values and flags so unset flags show up. Signed-off-by: mikezhang <[email protected]>
VermaSh · Jun 19, 2018 · 3fa66fb · 3fa66fb
1 parent 9d3b07f
commit 3fa66fb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/ddr/tools/getmacros b/ddr/tools/getmacros
@@ -30,6 +30,7 @@ default_regex="@ddr_namespace: *default"
 map_to_type_regex="@ddr_namespace: *map_to_type="
 flag_define_regex="^ *# *define +(${id}) *($|//|/\*)"
 flag_undef_regex="^ *# *undef +(${id}) *($|//|/\*)"
+flag_undef_regex_comment="^/\* #undef (${id}) \*/"
 value_define_regex="^ *# *define +(${id}) +[^ /].*($|//|/\*)"
 include_guard_regex=".*_[Hh]([Pp][Pp])?_? *($|//|/\*)"
 
@@ -162,6 +163,7 @@ process_one_policy_file() {
 		-e '/@ddr_namespace:/p' \
 		-e '/^ *# *define /p' \
 		-e '/^ *# *undef /p' \
+		-e '/^\/\* #undef /p' \
 	| while read -r line; do
 		if [[ ${line} =~ ${default_regex} ]]; then
 			set_default_namespaces
@@ -173,7 +175,7 @@ process_one_policy_file() {
 		elif [[ ${addFlags} -ne 0 && ${line} =~ ${flag_define_regex} ]]; then
 			# Print a define flag as a constant of 1.
 			define_flag_macro "${BASH_REMATCH[1]}"
-		elif [[ ${addFlags} -ne 0 && ${line} =~ ${flag_undef_regex} ]]; then
+		elif [[ ${addFlags} -ne 0 && ${line} =~ ${flag_undef_regex} || ${line} =~ ${flag_undef_regex_comment} ]]; then
 			# Print an undef flag as a constant of 0.
 			undef_flag_macro "${BASH_REMATCH[1]}"
 		fi

diff --git a/include_core/omrcfg.h.in b/include_core/omrcfg.h.in
@@ -29,7 +29,10 @@
 #if !defined(OMRCFG_H_)
 #define OMRCFG_H_
 
-/* @ddr_namespace: map_to_type=OmrBuildFlags */
+/**
+ * @ddr_namespace: map_to_type=OmrBuildFlags
+ * @ddr_options: valuesandbuildflags
+ */
 
 #undef OMR_GC
 #undef OMR_JIT

diff --git a/omrcfg.CMakeTemplate.h b/omrcfg.CMakeTemplate.h
@@ -28,7 +28,10 @@
 #if !defined(OMRCFG_H_)
 #define OMRCFG_H_
 
-/* @ddr_namespace: map_to_type=OmrBuildFlags */
+/**
+ * @ddr_namespace: map_to_type=OmrBuildFlags
+ * @ddr_options: valuesandbuildflags
+ */
 
 #cmakedefine OMR_GC
 #cmakedefine OMR_JIT