1.1 --- a/src/share/vm/runtime/globals_extension.hpp Wed Jun 04 13:51:09 2008 -0700
1.2 +++ b/src/share/vm/runtime/globals_extension.hpp Thu Jun 05 15:57:56 2008 -0700
1.3 @@ -74,21 +74,16 @@
1.4 #endif
1.5
1.6 typedef enum {
1.7 - RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER,
1.8 - RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER,
1.9 - RUNTIME_NOTPRODUCT_FLAG_MEMBER, RUNTIME_MANAGEABLE_FLAG_MEMBER,
1.10 - RUNTIME_PRODUCT_RW_FLAG_MEMBER,
1.11 - RUNTIME_LP64_PRODUCT_FLAG_MEMBER)
1.12 - RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER, RUNTIME_PD_DEVELOP_FLAG_MEMBER, RUNTIME_PRODUCT_FLAG_MEMBER,
1.13 - RUNTIME_PD_PRODUCT_FLAG_MEMBER, RUNTIME_DIAGNOSTIC_FLAG_MEMBER,
1.14 - RUNTIME_NOTPRODUCT_FLAG_MEMBER)
1.15 + 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_NOTPRODUCT_FLAG_MEMBER, RUNTIME_MANAGEABLE_FLAG_MEMBER, RUNTIME_PRODUCT_RW_FLAG_MEMBER, RUNTIME_LP64_PRODUCT_FLAG_MEMBER)
1.16 + 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)
1.17 +#ifndef KERNEL
1.18 + 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_NOTPRODUCT_FLAG_MEMBER, RUNTIME_MANAGEABLE_FLAG_MEMBER, RUNTIME_PRODUCT_RW_FLAG_MEMBER)
1.19 +#endif
1.20 #ifdef COMPILER1
1.21 - C1_FLAGS(C1_DEVELOP_FLAG_MEMBER, C1_PD_DEVELOP_FLAG_MEMBER, C1_PRODUCT_FLAG_MEMBER, C1_PD_PRODUCT_FLAG_MEMBER,
1.22 - C1_NOTPRODUCT_FLAG_MEMBER)
1.23 + C1_FLAGS(C1_DEVELOP_FLAG_MEMBER, C1_PD_DEVELOP_FLAG_MEMBER, C1_PRODUCT_FLAG_MEMBER, C1_PD_PRODUCT_FLAG_MEMBER, C1_NOTPRODUCT_FLAG_MEMBER)
1.24 #endif
1.25 #ifdef COMPILER2
1.26 - C2_FLAGS(C2_DEVELOP_FLAG_MEMBER, C2_PD_DEVELOP_FLAG_MEMBER, C2_PRODUCT_FLAG_MEMBER, C2_PD_PRODUCT_FLAG_MEMBER,
1.27 - C2_DIAGNOSTIC_FLAG_MEMBER, C2_NOTPRODUCT_FLAG_MEMBER)
1.28 + 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_NOTPRODUCT_FLAG_MEMBER)
1.29 #endif
1.30 NUM_CommandLineFlag
1.31 } CommandLineFlag;
1.32 @@ -144,24 +139,45 @@
1.33 #endif
1.34
1.35 typedef enum {
1.36 - RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE, RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
1.37 - RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.38 + RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE,
1.39 + RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
1.40 + RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.41 + RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.42 RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
1.43 RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE,
1.44 RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE,
1.45 RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE,
1.46 RUNTIME_LP64_PRODUCT_FLAG_MEMBER_WITH_TYPE)
1.47 -RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE, RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
1.48 - RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE, RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.49 - RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
1.50 - RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE)
1.51 + RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE,
1.52 + RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
1.53 + RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.54 + RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.55 + RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
1.56 + RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE)
1.57 +#ifndef KERNEL
1.58 + G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE,
1.59 + RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
1.60 + RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.61 + RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.62 + RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
1.63 + RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE,
1.64 + RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE,
1.65 + RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE)
1.66 +#endif // KERNEL
1.67 #ifdef COMPILER1
1.68 - C1_FLAGS(C1_DEVELOP_FLAG_MEMBER_WITH_TYPE, C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, C1_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.69 - C1_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, C1_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE)
1.70 + C1_FLAGS(C1_DEVELOP_FLAG_MEMBER_WITH_TYPE,
1.71 + C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
1.72 + C1_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.73 + C1_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.74 + C1_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE)
1.75 #endif
1.76 #ifdef COMPILER2
1.77 - C2_FLAGS(C2_DEVELOP_FLAG_MEMBER_WITH_TYPE, C2_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, C2_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.78 - C2_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, C2_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, C2_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE)
1.79 + C2_FLAGS(C2_DEVELOP_FLAG_MEMBER_WITH_TYPE,
1.80 + C2_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
1.81 + C2_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.82 + C2_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
1.83 + C2_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
1.84 + C2_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE)
1.85 #endif
1.86 NUM_CommandLineFlagWithType
1.87 } CommandLineFlagWithType;
