Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/globals_extension.hpp @ 12173:27ffd1c4537b
Merge
author | rbackman |
---|---|
date | Mon, 02 Sep 2013 13:13:45 +0200 |
parents | f98f5d48f511 |
children | 72b7e96c1922 |
comparison
equal
deleted
inserted
replaced
12128:c169f7038414 | 12173:27ffd1c4537b |
---|---|
55 #define RUNTIME_LP64_PRODUCT_FLAG_MEMBER(type, name, value, doc) /* flag is constant */ | 55 #define RUNTIME_LP64_PRODUCT_FLAG_MEMBER(type, name, value, doc) /* flag is constant */ |
56 #endif // _LP64 | 56 #endif // _LP64 |
57 | 57 |
58 #define C1_PRODUCT_FLAG_MEMBER(type, name, value, doc) FLAG_MEMBER(name), | 58 #define C1_PRODUCT_FLAG_MEMBER(type, name, value, doc) FLAG_MEMBER(name), |
59 #define C1_PD_PRODUCT_FLAG_MEMBER(type, name, doc) FLAG_MEMBER(name), | 59 #define C1_PD_PRODUCT_FLAG_MEMBER(type, name, doc) FLAG_MEMBER(name), |
60 #define C1_DIAGNOSTIC_FLAG_MEMBER(type, name, value, doc) FLAG_MEMBER(name), | |
60 #ifdef PRODUCT | 61 #ifdef PRODUCT |
61 #define C1_DEVELOP_FLAG_MEMBER(type, name, value, doc) /* flag is constant */ | 62 #define C1_DEVELOP_FLAG_MEMBER(type, name, value, doc) /* flag is constant */ |
62 #define C1_PD_DEVELOP_FLAG_MEMBER(type, name, doc) /* flag is constant */ | 63 #define C1_PD_DEVELOP_FLAG_MEMBER(type, name, doc) /* flag is constant */ |
63 #define C1_NOTPRODUCT_FLAG_MEMBER(type, name, value, doc) | 64 #define C1_NOTPRODUCT_FLAG_MEMBER(type, name, value, doc) |
64 #else | 65 #else |
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) | 98 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) |
98 #if INCLUDE_ALL_GCS | 99 #if INCLUDE_ALL_GCS |
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) | 100 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) |
100 #endif // INCLUDE_ALL_GCS | 101 #endif // INCLUDE_ALL_GCS |
101 #ifdef COMPILER1 | 102 #ifdef COMPILER1 |
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) | 103 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER, C1_PD_DEVELOP_FLAG_MEMBER, C1_PRODUCT_FLAG_MEMBER, C1_PD_PRODUCT_FLAG_MEMBER, C1_DIAGNOSTIC_FLAG_MEMBER, C1_NOTPRODUCT_FLAG_MEMBER) |
103 #endif | 104 #endif |
104 #ifdef COMPILER2 | 105 #ifdef COMPILER2 |
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) | 106 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) |
106 #endif | 107 #endif |
107 ARCH_FLAGS(ARCH_DEVELOP_FLAG_MEMBER, ARCH_PRODUCT_FLAG_MEMBER, ARCH_DIAGNOSTIC_FLAG_MEMBER, ARCH_EXPERIMENTAL_FLAG_MEMBER, ARCH_NOTPRODUCT_FLAG_MEMBER) | 108 ARCH_FLAGS(ARCH_DEVELOP_FLAG_MEMBER, ARCH_PRODUCT_FLAG_MEMBER, ARCH_DIAGNOSTIC_FLAG_MEMBER, ARCH_EXPERIMENTAL_FLAG_MEMBER, ARCH_NOTPRODUCT_FLAG_MEMBER) |
129 #define RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE(type, name, value, doc) FLAG_MEMBER_WITH_TYPE(name,type), | 130 #define RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE(type, name, value, doc) FLAG_MEMBER_WITH_TYPE(name,type), |
130 #endif | 131 #endif |
131 | 132 |
132 #define C1_PRODUCT_FLAG_MEMBER_WITH_TYPE(type, name, value, doc) FLAG_MEMBER_WITH_TYPE(name,type), | 133 #define C1_PRODUCT_FLAG_MEMBER_WITH_TYPE(type, name, value, doc) FLAG_MEMBER_WITH_TYPE(name,type), |
133 #define C1_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE(type, name, doc) FLAG_MEMBER_WITH_TYPE(name,type), | 134 #define C1_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE(type, name, doc) FLAG_MEMBER_WITH_TYPE(name,type), |
135 #define C1_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE(type, name, value, doc) FLAG_MEMBER_WITH_TYPE(name,type), | |
134 #ifdef PRODUCT | 136 #ifdef PRODUCT |
135 #define C1_DEVELOP_FLAG_MEMBER_WITH_TYPE(type, name, value, doc) /* flag is constant */ | 137 #define C1_DEVELOP_FLAG_MEMBER_WITH_TYPE(type, name, value, doc) /* flag is constant */ |
136 #define C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE(type, name, doc) /* flag is constant */ | 138 #define C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE(type, name, doc) /* flag is constant */ |
137 #define C1_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE(type, name, value, doc) | 139 #define C1_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE(type, name, value, doc) |
138 #else | 140 #else |
202 #ifdef COMPILER1 | 204 #ifdef COMPILER1 |
203 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER_WITH_TYPE, | 205 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER_WITH_TYPE, |
204 C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, | 206 C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, |
205 C1_PRODUCT_FLAG_MEMBER_WITH_TYPE, | 207 C1_PRODUCT_FLAG_MEMBER_WITH_TYPE, |
206 C1_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, | 208 C1_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, |
209 C1_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, | |
207 C1_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE) | 210 C1_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE) |
208 #endif | 211 #endif |
209 #ifdef COMPILER2 | 212 #ifdef COMPILER2 |
210 C2_FLAGS(C2_DEVELOP_FLAG_MEMBER_WITH_TYPE, | 213 C2_FLAGS(C2_DEVELOP_FLAG_MEMBER_WITH_TYPE, |
211 C2_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, | 214 C2_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, |