Mercurial > hg > truffle
comparison src/share/vm/runtime/globals_extension.hpp @ 8001:db9981fd3124
8005915: Unify SERIALGC and INCLUDE_ALTERNATE_GCS
Summary: Rename INCLUDE_ALTERNATE_GCS to INCLUDE_ALL_GCS and replace SERIALGC with INCLUDE_ALL_GCS.
Reviewed-by: coleenp, stefank
author | jprovino |
---|---|
date | Wed, 23 Jan 2013 13:02:39 -0500 |
parents | fb19af007ffc |
children | 5fc51c1ecdeb f98f5d48f511 |
comparison
equal
deleted
inserted
replaced
7619:46e60405583b | 8001:db9981fd3124 |
---|---|
24 | 24 |
25 #ifndef SHARE_VM_RUNTIME_GLOBALS_EXTENSION_HPP | 25 #ifndef SHARE_VM_RUNTIME_GLOBALS_EXTENSION_HPP |
26 #define SHARE_VM_RUNTIME_GLOBALS_EXTENSION_HPP | 26 #define SHARE_VM_RUNTIME_GLOBALS_EXTENSION_HPP |
27 | 27 |
28 #include "runtime/globals.hpp" | 28 #include "runtime/globals.hpp" |
29 #include "utilities/macros.hpp" | |
29 #include "utilities/top.hpp" | 30 #include "utilities/top.hpp" |
30 | 31 |
31 // Construct enum of Flag_<cmdline-arg> constants. | 32 // Construct enum of Flag_<cmdline-arg> constants. |
32 | 33 |
33 // Parens left off in the following for the enum decl below. | 34 // Parens left off in the following for the enum decl below. |
92 #endif | 93 #endif |
93 | 94 |
94 typedef enum { | 95 typedef enum { |
95 RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER, RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER, RUNTIME_EXPERIMENTAL_FLAG_MEMBER, RUNTIME_NOTPRODUCT_FLAG_MEMBER, RUNTIME_MANAGEABLE_FLAG_MEMBER, RUNTIME_PRODUCT_RW_FLAG_MEMBER, RUNTIME_LP64_PRODUCT_FLAG_MEMBER) | 96 RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER, RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER, RUNTIME_EXPERIMENTAL_FLAG_MEMBER, RUNTIME_NOTPRODUCT_FLAG_MEMBER, RUNTIME_MANAGEABLE_FLAG_MEMBER, RUNTIME_PRODUCT_RW_FLAG_MEMBER, RUNTIME_LP64_PRODUCT_FLAG_MEMBER) |
96 RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER, RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER, RUNTIME_NOTPRODUCT_FLAG_MEMBER) | 97 RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER, RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER, RUNTIME_NOTPRODUCT_FLAG_MEMBER) |
97 #if INCLUDE_ALTERNATE_GCS | 98 #if INCLUDE_ALL_GCS |
98 G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER, RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER, RUNTIME_EXPERIMENTAL_FLAG_MEMBER, RUNTIME_NOTPRODUCT_FLAG_MEMBER, RUNTIME_MANAGEABLE_FLAG_MEMBER, RUNTIME_PRODUCT_RW_FLAG_MEMBER) | 99 G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER, RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER, RUNTIME_EXPERIMENTAL_FLAG_MEMBER, RUNTIME_NOTPRODUCT_FLAG_MEMBER, RUNTIME_MANAGEABLE_FLAG_MEMBER, RUNTIME_PRODUCT_RW_FLAG_MEMBER) |
99 #endif // INCLUDE_ALTERNATE_GCS | 100 #endif // INCLUDE_ALL_GCS |
100 #ifdef COMPILER1 | 101 #ifdef COMPILER1 |
101 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER, C1_PD_DEVELOP_FLAG_MEMBER, C1_PRODUCT_FLAG_MEMBER, C1_PD_PRODUCT_FLAG_MEMBER, C1_NOTPRODUCT_FLAG_MEMBER) | 102 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER, C1_PD_DEVELOP_FLAG_MEMBER, C1_PRODUCT_FLAG_MEMBER, C1_PD_PRODUCT_FLAG_MEMBER, C1_NOTPRODUCT_FLAG_MEMBER) |
102 #endif | 103 #endif |
103 #ifdef COMPILER2 | 104 #ifdef COMPILER2 |
104 C2_FLAGS(C2_DEVELOP_FLAG_MEMBER, C2_PD_DEVELOP_FLAG_MEMBER, C2_PRODUCT_FLAG_MEMBER, C2_PD_PRODUCT_FLAG_MEMBER, C2_DIAGNOSTIC_FLAG_MEMBER, C2_EXPERIMENTAL_FLAG_MEMBER, C2_NOTPRODUCT_FLAG_MEMBER) | 105 C2_FLAGS(C2_DEVELOP_FLAG_MEMBER, C2_PD_DEVELOP_FLAG_MEMBER, C2_PRODUCT_FLAG_MEMBER, C2_PD_PRODUCT_FLAG_MEMBER, C2_DIAGNOSTIC_FLAG_MEMBER, C2_EXPERIMENTAL_FLAG_MEMBER, C2_NOTPRODUCT_FLAG_MEMBER) |
185 RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, | 186 RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, |
186 RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE, | 187 RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE, |
187 RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, | 188 RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, |
188 RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, | 189 RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, |
189 RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE) | 190 RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE) |
190 #if INCLUDE_ALTERNATE_GCS | 191 #if INCLUDE_ALL_GCS |
191 G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE, | 192 G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE, |
192 RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, | 193 RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, |
193 RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE, | 194 RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE, |
194 RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, | 195 RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, |
195 RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, | 196 RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, |
196 RUNTIME_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE, | 197 RUNTIME_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE, |
197 RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE, | 198 RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE, |
198 RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE, | 199 RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE, |
199 RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE) | 200 RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE) |
200 #endif // INCLUDE_ALTERNATE_GCS | 201 #endif // INCLUDE_ALL_GCS |
201 #ifdef COMPILER1 | 202 #ifdef COMPILER1 |
202 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER_WITH_TYPE, | 203 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER_WITH_TYPE, |
203 C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, | 204 C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, |
204 C1_PRODUCT_FLAG_MEMBER_WITH_TYPE, | 205 C1_PRODUCT_FLAG_MEMBER_WITH_TYPE, |
205 C1_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, | 206 C1_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, |