comparison src/share/vm/runtime/globals_extension.hpp @ 8124:5fc51c1ecdeb

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Tue, 05 Mar 2013 23:44:54 +0100
parents 1baf7f1e3f23 db9981fd3124
children cefad50507d8
comparison
equal deleted inserted replaced
7943:a413bcd552a4 8124:5fc51c1ecdeb
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.
104 #endif 105 #endif
105 106
106 typedef enum { 107 typedef enum {
107 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) 108 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)
108 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) 109 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)
109 #if INCLUDE_ALTERNATE_GCS 110 #if INCLUDE_ALL_GCS
110 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) 111 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)
111 #endif // INCLUDE_ALTERNATE_GCS 112 #endif // INCLUDE_ALL_GCS
112 #ifdef COMPILER1 113 #ifdef COMPILER1
113 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER, C1_PD_DEVELOP_FLAG_MEMBER, C1_PRODUCT_FLAG_MEMBER, C1_PD_PRODUCT_FLAG_MEMBER, C1_NOTPRODUCT_FLAG_MEMBER) 114 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER, C1_PD_DEVELOP_FLAG_MEMBER, C1_PRODUCT_FLAG_MEMBER, C1_PD_PRODUCT_FLAG_MEMBER, C1_NOTPRODUCT_FLAG_MEMBER)
114 #endif 115 #endif
115 #ifdef GRAAL 116 #ifdef GRAAL
116 GRAAL_FLAGS(GRAAL_DEVELOP_FLAG_MEMBER, GRAAL_PD_DEVELOP_FLAG_MEMBER, GRAAL_PRODUCT_FLAG_MEMBER, GRAAL_PD_PRODUCT_FLAG_MEMBER, GRAAL_NOTPRODUCT_FLAG_MEMBER) 117 GRAAL_FLAGS(GRAAL_DEVELOP_FLAG_MEMBER, GRAAL_PD_DEVELOP_FLAG_MEMBER, GRAAL_PRODUCT_FLAG_MEMBER, GRAAL_PD_PRODUCT_FLAG_MEMBER, GRAAL_NOTPRODUCT_FLAG_MEMBER)
211 RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, 212 RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
212 RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE, 213 RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE,
213 RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, 214 RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
214 RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, 215 RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
215 RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE) 216 RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE)
216 #if INCLUDE_ALTERNATE_GCS 217 #if INCLUDE_ALL_GCS
217 G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE, 218 G1_FLAGS(RUNTIME_DEVELOP_FLAG_MEMBER_WITH_TYPE,
218 RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, 219 RUNTIME_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
219 RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE, 220 RUNTIME_PRODUCT_FLAG_MEMBER_WITH_TYPE,
220 RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, 221 RUNTIME_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,
221 RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE, 222 RUNTIME_DIAGNOSTIC_FLAG_MEMBER_WITH_TYPE,
222 RUNTIME_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE, 223 RUNTIME_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE,
223 RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE, 224 RUNTIME_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE,
224 RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE, 225 RUNTIME_MANAGEABLE_FLAG_MEMBER_WITH_TYPE,
225 RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE) 226 RUNTIME_PRODUCT_RW_FLAG_MEMBER_WITH_TYPE)
226 #endif // INCLUDE_ALTERNATE_GCS 227 #endif // INCLUDE_ALL_GCS
227 #ifdef COMPILER1 228 #ifdef COMPILER1
228 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER_WITH_TYPE, 229 C1_FLAGS(C1_DEVELOP_FLAG_MEMBER_WITH_TYPE,
229 C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE, 230 C1_PD_DEVELOP_FLAG_MEMBER_WITH_TYPE,
230 C1_PRODUCT_FLAG_MEMBER_WITH_TYPE, 231 C1_PRODUCT_FLAG_MEMBER_WITH_TYPE,
231 C1_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE, 232 C1_PD_PRODUCT_FLAG_MEMBER_WITH_TYPE,