Mercurial > hg > truffle

comparison src/share/vm/runtime/globals.cpp @ 12355:cefad50507d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hs25-b53
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 10:38:03 +0200
parents 6b0fd0964b87 72b7e96c1922
children 359f7e70ae7f
comparison
equal deleted inserted replaced
12058:ccb4f2af2319 12355:cefad50507d8
63 MATERIALIZE_NOTPRODUCT_FLAG) 63 MATERIALIZE_NOTPRODUCT_FLAG)
64 64
65 MATERIALIZE_FLAGS_EXT 65 MATERIALIZE_FLAGS_EXT
66 66
67 67
68 void Flag::check_writable() {
69 if (is_constant_in_binary()) {
70 fatal(err_msg("flag is constant: %s", _name));
71 }
72 }
73
74 bool Flag::is_bool() const {
75 return strcmp(_type, "bool") == 0;
76 }
77
78 bool Flag::get_bool() const {
79 return *((bool*) _addr);
80 }
81
82 void Flag::set_bool(bool value) {
83 check_writable();
84 *((bool*) _addr) = value;
85 }
86
87 bool Flag::is_intx() const {
88 return strcmp(_type, "intx") == 0;
89 }
90
91 intx Flag::get_intx() const {
92 return *((intx*) _addr);
93 }
94
95 void Flag::set_intx(intx value) {
96 check_writable();
97 *((intx*) _addr) = value;
98 }
99
100 bool Flag::is_uintx() const {
101 return strcmp(_type, "uintx") == 0;
102 }
103
104 uintx Flag::get_uintx() const {
105 return *((uintx*) _addr);
106 }
107
108 void Flag::set_uintx(uintx value) {
109 check_writable();
110 *((uintx*) _addr) = value;
111 }
112
113 bool Flag::is_uint64_t() const {
114 return strcmp(_type, "uint64_t") == 0;
115 }
116
117 uint64_t Flag::get_uint64_t() const {
118 return *((uint64_t*) _addr);
119 }
120
121 void Flag::set_uint64_t(uint64_t value) {
122 check_writable();
123 *((uint64_t*) _addr) = value;
124 }
125
126 bool Flag::is_double() const {
127 return strcmp(_type, "double") == 0;
128 }
129
130 double Flag::get_double() const {
131 return *((double*) _addr);
132 }
133
134 void Flag::set_double(double value) {
135 check_writable();
136 *((double*) _addr) = value;
137 }
138
139 bool Flag::is_ccstr() const {
140 return strcmp(_type, "ccstr") == 0 || strcmp(_type, "ccstrlist") == 0;
141 }
142
143 bool Flag::ccstr_accumulates() const {
144 return strcmp(_type, "ccstrlist") == 0;
145 }
146
147 ccstr Flag::get_ccstr() const {
148 return *((ccstr*) _addr);
149 }
150
151 void Flag::set_ccstr(ccstr value) {
152 check_writable();
153 *((ccstr*) _addr) = value;
154 }
155
156
157 Flag::Flags Flag::get_origin() {
158 return Flags(_flags & VALUE_ORIGIN_MASK);
159 }
160
161 void Flag::set_origin(Flags origin) {
162 assert((origin & VALUE_ORIGIN_MASK) == origin, "sanity");
163 _flags = Flags((_flags & ~VALUE_ORIGIN_MASK) | origin);
164 }
165
166 bool Flag::is_default() {
167 return (get_origin() == DEFAULT);
168 }
169
170 bool Flag::is_ergonomic() {
171 return (get_origin() == ERGONOMIC);
172 }
173
174 bool Flag::is_command_line() {
175 return (get_origin() == COMMAND_LINE);
176 }
177
178 bool Flag::is_product() const {
179 return (_flags & KIND_PRODUCT) != 0;
180 }
181
182 bool Flag::is_manageable() const {
183 return (_flags & KIND_MANAGEABLE) != 0;
184 }
185
186 bool Flag::is_diagnostic() const {
187 return (_flags & KIND_DIAGNOSTIC) != 0;
188 }
189
190 bool Flag::is_experimental() const {
191 return (_flags & KIND_EXPERIMENTAL) != 0;
192 }
193
194 bool Flag::is_notproduct() const {
195 return (_flags & KIND_NOT_PRODUCT) != 0;
196 }
197
198 bool Flag::is_develop() const {
199 return (_flags & KIND_DEVELOP) != 0;
200 }
201
202 bool Flag::is_read_write() const {
203 return (_flags & KIND_READ_WRITE) != 0;
204 }
205
206 bool Flag::is_commercial() const {
207 return (_flags & KIND_COMMERCIAL) != 0;
208 }
209
210 /**
211 * Returns if this flag is a constant in the binary. Right now this is
212 * true for notproduct and develop flags in product builds.
213 */
214 bool Flag::is_constant_in_binary() const {
215 #ifdef PRODUCT
216 return is_notproduct() || is_develop();
217 #else
218 return false;
219 #endif
220 }
221
68 bool Flag::is_unlocker() const { 222 bool Flag::is_unlocker() const {
69 return strcmp(name, "UnlockDiagnosticVMOptions") == 0 || 223 return strcmp(_name, "UnlockDiagnosticVMOptions") == 0 ||
70 strcmp(name, "UnlockExperimentalVMOptions") == 0 || 224 strcmp(_name, "UnlockExperimentalVMOptions") == 0 ||
71 is_unlocker_ext(); 225 is_unlocker_ext();
72 } 226 }
73 227
74 bool Flag::is_unlocked() const { 228 bool Flag::is_unlocked() const {
75 if (strcmp(kind, "{diagnostic}") == 0 || 229 if (is_diagnostic()) {
76 strcmp(kind, "{C2 diagnostic}") == 0 ||
77 strcmp(kind, "{ARCH diagnostic}") == 0 ||
78 strcmp(kind, "{Shark diagnostic}") == 0) {
79 return UnlockDiagnosticVMOptions; 230 return UnlockDiagnosticVMOptions;
80 } else if (strcmp(kind, "{experimental}") == 0 || 231 }
81 strcmp(kind, "{C2 experimental}") == 0 || 232 if (is_experimental()) {
82 strcmp(kind, "{ARCH experimental}") == 0 ||
83 strcmp(kind, "{Shark experimental}") == 0) {
84 return UnlockExperimentalVMOptions; 233 return UnlockExperimentalVMOptions;
85 } else { 234 }
86 return is_unlocked_ext(); 235 return is_unlocked_ext();
87 }
88 } 236 }
89 237
90 // Get custom message for this locked flag, or return NULL if 238 // Get custom message for this locked flag, or return NULL if
91 // none is available. 239 // none is available.
92 void Flag::get_locked_message(char* buf, int buflen) const { 240 void Flag::get_locked_message(char* buf, int buflen) const {
93 get_locked_message_ext(buf, buflen); 241 get_locked_message_ext(buf, buflen);
94 } 242 }
95 243
96 bool Flag::is_writeable() const { 244 bool Flag::is_writeable() const {
97 return strcmp(kind, "{manageable}") == 0 || 245 return is_manageable() || (is_product() && is_read_write()) || is_writeable_ext();
98 strcmp(kind, "{product rw}") == 0 ||
99 is_writeable_ext();
100 } 246 }
101 247
102 // All flags except "manageable" are assumed to be internal flags. 248 // All flags except "manageable" are assumed to be internal flags.
103 // Long term, we need to define a mechanism to specify which flags 249 // Long term, we need to define a mechanism to specify which flags
104 // are external/stable and change this function accordingly. 250 // are external/stable and change this function accordingly.
105 bool Flag::is_external() const { 251 bool Flag::is_external() const {
106 return strcmp(kind, "{manageable}") == 0 || is_external_ext(); 252 return is_manageable() || is_external_ext();
107 } 253 }
108 254
109 255
110 // Length of format string (e.g. "%.1234s") for printing ccstr below 256 // Length of format string (e.g. "%.1234s") for printing ccstr below
111 #define FORMAT_BUFFER_LEN 16 257 #define FORMAT_BUFFER_LEN 16
112 258
113 void Flag::print_on(outputStream* st, bool withComments) { 259 void Flag::print_on(outputStream* st, bool withComments) {
114 st->print("%9s %-40s %c= ", type, name, (origin != DEFAULT ? ':' : ' ')); 260 // Don't print notproduct and develop flags in a product build.
115 if (is_bool()) st->print("%-16s", get_bool() ? "true" : "false"); 261 if (is_constant_in_binary()) {
116 if (is_intx()) st->print("%-16ld", get_intx()); 262 return;
117 if (is_uintx()) st->print("%-16lu", get_uintx()); 263 }
118 if (is_uint64_t()) st->print("%-16lu", get_uint64_t()); 264
119 if (is_double()) st->print("%-16f", get_double()); 265 st->print("%9s %-40s %c= ", _type, _name, (!is_default() ? ':' : ' '));
120 266
267 if (is_bool()) {
268 st->print("%-16s", get_bool() ? "true" : "false");
269 }
270 if (is_intx()) {
271 st->print("%-16ld", get_intx());
272 }
273 if (is_uintx()) {
274 st->print("%-16lu", get_uintx());
275 }
276 if (is_uint64_t()) {
277 st->print("%-16lu", get_uint64_t());
278 }
279 if (is_double()) {
280 st->print("%-16f", get_double());
281 }
121 if (is_ccstr()) { 282 if (is_ccstr()) {
122 const char* cp = get_ccstr(); 283 const char* cp = get_ccstr();
123 if (cp != NULL) { 284 if (cp != NULL) {
124 const char* eol; 285 const char* eol;
125 while ((eol = strchr(cp, '\n')) != NULL) { 286 while ((eol = strchr(cp, '\n')) != NULL) {
126 char format_buffer[FORMAT_BUFFER_LEN]; 287 char format_buffer[FORMAT_BUFFER_LEN];
127 size_t llen = pointer_delta(eol, cp, sizeof(char)); 288 size_t llen = pointer_delta(eol, cp, sizeof(char));
128 jio_snprintf(format_buffer, FORMAT_BUFFER_LEN, 289 jio_snprintf(format_buffer, FORMAT_BUFFER_LEN,
129 "%%." SIZE_FORMAT "s", llen); 290 "%%." SIZE_FORMAT "s", llen);
130 st->print(format_buffer, cp); 291 st->print(format_buffer, cp);
131 st->cr(); 292 st->cr();
132 cp = eol+1; 293 cp = eol+1;
133 st->print("%5s %-35s += ", "", name); 294 st->print("%5s %-35s += ", "", _name);
134 } 295 }
135 st->print("%-16s", cp); 296 st->print("%-16s", cp);
136 } 297 }
137 else st->print("%-16s", ""); 298 else st->print("%-16s", "");
138 } 299 }
139 st->print("%-20s", kind); 300
301 st->print("%-20");
302 print_kind(st);
303
140 if (withComments) { 304 if (withComments) {
141 #ifndef PRODUCT 305 #ifndef PRODUCT
142 st->print("%s", doc ); 306 st->print("%s", _doc);
143 #endif 307 #endif
144 } 308 }
145 st->cr(); 309 st->cr();
310 }
311
312 void Flag::print_kind(outputStream* st) {
313 struct Data {
314 int flag;
315 const char* name;
316 };
317
318 Data data[] = {
319 { KIND_C1, "C1" },
320 { KIND_GRAAL, "Graal" },
321 { KIND_C2, "C2" },
322 { KIND_ARCH, "ARCH" },
323 { KIND_SHARK, "SHARK" },
324 { KIND_PLATFORM_DEPENDENT, "pd" },
325 { KIND_PRODUCT, "product" },
326 { KIND_MANAGEABLE, "manageable" },
327 { KIND_DIAGNOSTIC, "diagnostic" },
328 { KIND_NOT_PRODUCT, "notproduct" },
329 { KIND_DEVELOP, "develop" },
330 { KIND_LP64_PRODUCT, "lp64_product" },
331 { KIND_READ_WRITE, "rw" },
332 { -1, "" }
333 };
334
335 if ((_flags & KIND_MASK) != 0) {
336 st->print("{");
337 bool is_first = true;
338
339 for (int i = 0; data[i].flag != -1; i++) {
340 Data d = data[i];
341 if ((_flags & d.flag) != 0) {
342 if (is_first) {
343 is_first = false;
344 } else {
345 st->print(" ");
346 }
347 st->print(d.name);
348 }
349 }
350
351 st->print("}");
352 }
146 } 353 }
147 354
148 void Flag::print_as_flag(outputStream* st) { 355 void Flag::print_as_flag(outputStream* st) {
149 if (is_bool()) { 356 if (is_bool()) {
150 st->print("-XX:%s%s", get_bool() ? "+" : "-", name); 357 st->print("-XX:%s%s", get_bool() ? "+" : "-", _name);
151 } else if (is_intx()) { 358 } else if (is_intx()) {
152 st->print("-XX:%s=" INTX_FORMAT, name, get_intx()); 359 st->print("-XX:%s=" INTX_FORMAT, _name, get_intx());
153 } else if (is_uintx()) { 360 } else if (is_uintx()) {
154 st->print("-XX:%s=" UINTX_FORMAT, name, get_uintx()); 361 st->print("-XX:%s=" UINTX_FORMAT, _name, get_uintx());
155 } else if (is_uint64_t()) { 362 } else if (is_uint64_t()) {
156 st->print("-XX:%s=" UINT64_FORMAT, name, get_uint64_t()); 363 st->print("-XX:%s=" UINT64_FORMAT, _name, get_uint64_t());
157 } else if (is_double()) { 364 } else if (is_double()) {
158 st->print("-XX:%s=%f", name, get_double()); 365 st->print("-XX:%s=%f", _name, get_double());
159 } else if (is_ccstr()) { 366 } else if (is_ccstr()) {
160 st->print("-XX:%s=", name); 367 st->print("-XX:%s=", _name);
161 const char* cp = get_ccstr(); 368 const char* cp = get_ccstr();
162 if (cp != NULL) { 369 if (cp != NULL) {
163 // Need to turn embedded '\n's back into separate arguments 370 // Need to turn embedded '\n's back into separate arguments
164 // Not so efficient to print one character at a time, 371 // Not so efficient to print one character at a time,
165 // but the choice is to do the transformation to a buffer 372 // but the choice is to do the transformation to a buffer
168 switch (*cp) { 375 switch (*cp) {
169 default: 376 default:
170 st->print("%c", *cp); 377 st->print("%c", *cp);
171 break; 378 break;
172 case '\n': 379 case '\n':
173 st->print(" -XX:%s=", name); 380 st->print(" -XX:%s=", _name);
174 break; 381 break;
175 } 382 }
176 } 383 }
177 } 384 }
178 } else { 385 } else {
181 } 388 }
182 389
183 // 4991491 do not "optimize out" the was_set false values: omitting them 390 // 4991491 do not "optimize out" the was_set false values: omitting them
184 // tickles a Microsoft compiler bug causing flagTable to be malformed 391 // tickles a Microsoft compiler bug causing flagTable to be malformed
185 392
186 #define RUNTIME_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{product}", DEFAULT }, 393 #define NAME(name) NOT_PRODUCT(&name) PRODUCT_ONLY(&CONST_##name)
187 #define RUNTIME_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{pd product}", DEFAULT }, 394
188 #define RUNTIME_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{diagnostic}", DEFAULT }, 395 #define RUNTIME_PRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_PRODUCT) },
189 #define RUNTIME_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{experimental}", DEFAULT }, 396 #define RUNTIME_PD_PRODUCT_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_PRODUCT | Flag::KIND_PLATFORM_DEPENDENT) },
190 #define RUNTIME_MANAGEABLE_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{manageable}", DEFAULT }, 397 #define RUNTIME_DIAGNOSTIC_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_DIAGNOSTIC) },
191 #define RUNTIME_PRODUCT_RW_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{product rw}", DEFAULT }, 398 #define RUNTIME_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_EXPERIMENTAL) },
192 399 #define RUNTIME_MANAGEABLE_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_MANAGEABLE) },
193 #ifdef PRODUCT 400 #define RUNTIME_PRODUCT_RW_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_PRODUCT | Flag::KIND_READ_WRITE) },
194 #define RUNTIME_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */ 401 #define RUNTIME_DEVELOP_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_DEVELOP) },
195 #define RUNTIME_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */ 402 #define RUNTIME_PD_DEVELOP_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_DEVELOP | Flag::KIND_PLATFORM_DEPENDENT) },
196 #define RUNTIME_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) 403 #define RUNTIME_NOTPRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_NOT_PRODUCT) },
404
405 #ifdef _LP64
406 #define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_LP64_PRODUCT) },
197 #else 407 #else
198 #define RUNTIME_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "", DEFAULT }, 408 #define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
199 #define RUNTIME_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{pd}", DEFAULT },
200 #define RUNTIME_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{notproduct}", DEFAULT },
201 #endif
202
203 #ifdef _LP64
204 #define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{lp64_product}", DEFAULT },
205 #else
206 #define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
207 #endif // _LP64 409 #endif // _LP64
208 410
209 #define C1_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C1 product}", DEFAULT }, 411 #define C1_PRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C1 | Flag::KIND_PRODUCT) },
210 #define C1_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C1 pd product}", DEFAULT }, 412 #define C1_PD_PRODUCT_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C1 | Flag::KIND_PRODUCT | Flag::KIND_PLATFORM_DEPENDENT) },
211 #ifdef PRODUCT 413 #define C1_DIAGNOSTIC_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C1 | Flag::KIND_DIAGNOSTIC) },
212 #define C1_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */ 414 #define C1_DEVELOP_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C1 | Flag::KIND_DEVELOP) },
213 #define C1_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */ 415 #define C1_PD_DEVELOP_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C1 | Flag::KIND_DEVELOP | Flag::KIND_PLATFORM_DEPENDENT) },
214 #define C1_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) 416 #define C1_NOTPRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C1 | Flag::KIND_NOT_PRODUCT) },
215 #else 417
216 #define C1_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C1}", DEFAULT }, 418 #define GRAAL_PRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_GRAAL | Flag::KIND_PRODUCT) },
217 #define C1_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{C1 pd}", DEFAULT }, 419 #define GRAAL_PD_PRODUCT_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_GRAAL | Flag::KIND_PRODUCT | Flag::KIND_PLATFORM_DEPENDENT) },
218 #define C1_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C1 notproduct}", DEFAULT }, 420 #define GRAAL_DIAGNOSTIC_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_GRAAL | Flag::KIND_DIAGNOSTIC) },
219 #endif 421 #define GRAAL_DEVELOP_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_GRAAL | Flag::KIND_DEVELOP) },
220 422 #define GRAAL_PD_DEVELOP_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_GRAAL | Flag::KIND_DEVELOP | Flag::KIND_PLATFORM_DEPENDENT) },
221 #define GRAAL_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Graal product}", DEFAULT }, 423 #define GRAAL_NOTPRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_GRAAL | Flag::KIND_NOT_PRODUCT) },
222 #define GRAAL_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Graal pd product}", DEFAULT }, 424
223 #ifdef PRODUCT 425 #define C2_PRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_PRODUCT) },
224 #define GRAAL_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */ 426 #define C2_PD_PRODUCT_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_PRODUCT | Flag::KIND_PLATFORM_DEPENDENT) },
225 #define GRAAL_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */ 427 #define C2_DIAGNOSTIC_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_DIAGNOSTIC) },
226 #define GRAAL_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) 428 #define C2_EXPERIMENTAL_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_EXPERIMENTAL) },
227 #else 429 #define C2_DEVELOP_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_DEVELOP) },
228 #define GRAAL_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{Graal}", DEFAULT }, 430 #define C2_PD_DEVELOP_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_DEVELOP | Flag::KIND_PLATFORM_DEPENDENT) },
229 #define GRAAL_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{Graal pd}", DEFAULT }, 431 #define C2_NOTPRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_C2 | Flag::KIND_NOT_PRODUCT) },
230 #define GRAAL_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{Graal notproduct}", DEFAULT }, 432
231 #endif 433 #define ARCH_PRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_ARCH | Flag::KIND_PRODUCT) },
232 434 #define ARCH_DIAGNOSTIC_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_ARCH | Flag::KIND_DIAGNOSTIC) },
233 #define C2_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 product}", DEFAULT }, 435 #define ARCH_EXPERIMENTAL_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_ARCH | Flag::KIND_EXPERIMENTAL) },
234 #define C2_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 pd product}", DEFAULT }, 436 #define ARCH_DEVELOP_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_ARCH | Flag::KIND_DEVELOP) },
235 #define C2_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 diagnostic}", DEFAULT }, 437 #define ARCH_NOTPRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_ARCH | Flag::KIND_NOT_PRODUCT) },
236 #define C2_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 experimental}", DEFAULT }, 438
237 #ifdef PRODUCT 439 #define SHARK_PRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_SHARK | Flag::KIND_PRODUCT) },
238 #define C2_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */ 440 #define SHARK_PD_PRODUCT_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_SHARK | Flag::KIND_PRODUCT | Flag::KIND_PLATFORM_DEPENDENT) },
239 #define C2_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */ 441 #define SHARK_DIAGNOSTIC_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_SHARK | Flag::KIND_DIAGNOSTIC) },
240 #define C2_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) 442 #define SHARK_DEVELOP_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_SHARK | Flag::KIND_DEVELOP) },
241 #else 443 #define SHARK_PD_DEVELOP_FLAG_STRUCT( type, name, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_SHARK | Flag::KIND_DEVELOP | Flag::KIND_PLATFORM_DEPENDENT) },
242 #define C2_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C2}", DEFAULT }, 444 #define SHARK_NOTPRODUCT_FLAG_STRUCT( type, name, value, doc) { #type, XSTR(name), NAME(name), NOT_PRODUCT_ARG(doc) Flag::Flags(Flag::DEFAULT | Flag::KIND_SHARK | Flag::KIND_NOT_PRODUCT) },
243 #define C2_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{C2 pd}", DEFAULT },
244 #define C2_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C2 notproduct}", DEFAULT },
245 #endif
246
247 #define ARCH_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{ARCH product}", DEFAULT },
248 #define ARCH_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{ARCH diagnostic}", DEFAULT },
249 #define ARCH_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{ARCH experimental}", DEFAULT },
250 #ifdef PRODUCT
251 #define ARCH_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
252 #define ARCH_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc)
253 #else
254 #define ARCH_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{ARCH}", DEFAULT },
255 #define ARCH_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{ARCH notproduct}", DEFAULT },
256 #endif
257
258 #define SHARK_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Shark product}", DEFAULT },
259 #define SHARK_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Shark pd product}", DEFAULT },
260 #define SHARK_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Shark diagnostic}", DEFAULT },
261 #ifdef PRODUCT
262 #define SHARK_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
263 #define SHARK_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */
264 #define SHARK_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc)
265 #else
266 #define SHARK_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{Shark}", DEFAULT },
267 #define SHARK_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{Shark pd}", DEFAULT },
268 #define SHARK_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{Shark notproduct}", DEFAULT },
269 #endif
270 445
271 static Flag flagTable[] = { 446 static Flag flagTable[] = {
272 RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT, RUNTIME_LP64_PRODUCT_FLAG_STRUCT) 447 RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT, RUNTIME_LP64_PRODUCT_FLAG_STRUCT)
273 RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT) 448 RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT)
274 #if INCLUDE_ALL_GCS 449 #if INCLUDE_ALL_GCS
275 G1_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT) 450 G1_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT)
276 #endif // INCLUDE_ALL_GCS 451 #endif // INCLUDE_ALL_GCS
277 #ifdef COMPILER1 452 #ifdef COMPILER1
278 C1_FLAGS(C1_DEVELOP_FLAG_STRUCT, C1_PD_DEVELOP_FLAG_STRUCT, C1_PRODUCT_FLAG_STRUCT, C1_PD_PRODUCT_FLAG_STRUCT, C1_NOTPRODUCT_FLAG_STRUCT) 453 C1_FLAGS(C1_DEVELOP_FLAG_STRUCT, C1_PD_DEVELOP_FLAG_STRUCT, C1_PRODUCT_FLAG_STRUCT, C1_PD_PRODUCT_FLAG_STRUCT, C1_DIAGNOSTIC_FLAG_STRUCT, C1_NOTPRODUCT_FLAG_STRUCT)
279 #endif 454 #endif
280 #ifdef GRAAL 455 #ifdef GRAAL
281 GRAAL_FLAGS(GRAAL_DEVELOP_FLAG_STRUCT, GRAAL_PD_DEVELOP_FLAG_STRUCT, GRAAL_PRODUCT_FLAG_STRUCT, GRAAL_PD_PRODUCT_FLAG_STRUCT, GRAAL_NOTPRODUCT_FLAG_STRUCT) 456 GRAAL_FLAGS(GRAAL_DEVELOP_FLAG_STRUCT, GRAAL_PD_DEVELOP_FLAG_STRUCT, GRAAL_PRODUCT_FLAG_STRUCT, GRAAL_PD_PRODUCT_FLAG_STRUCT, GRAAL_NOTPRODUCT_FLAG_STRUCT)
282 #endif 457 #endif
283 #ifdef COMPILER2 458 #ifdef COMPILER2
300 return strncmp(s, q, len) == 0; 475 return strncmp(s, q, len) == 0;
301 } 476 }
302 477
303 // Search the flag table for a named flag 478 // Search the flag table for a named flag
304 Flag* Flag::find_flag(const char* name, size_t length, bool allow_locked) { 479 Flag* Flag::find_flag(const char* name, size_t length, bool allow_locked) {
305 for (Flag* current = &flagTable[0]; current->name != NULL; current++) { 480 for (Flag* current = &flagTable[0]; current->_name != NULL; current++) {
306 if (str_equal(current->name, name, length)) { 481 if (str_equal(current->_name, name, length)) {
307 // Found a matching entry. Report locked flags only if allowed. 482 // Found a matching entry.
483 // Don't report notproduct and develop flags in product builds.
484 if (current->is_constant_in_binary()) {
485 return NULL;
486 }
487 // Report locked flags only if allowed.
308 if (!(current->is_unlocked() || current->is_unlocker())) { 488 if (!(current->is_unlocked() || current->is_unlocker())) {
309 if (!allow_locked) { 489 if (!allow_locked) {
310 // disable use of locked flags, e.g. diagnostic, experimental, 490 // disable use of locked flags, e.g. diagnostic, experimental,
311 // commercial... until they are explicitly unlocked 491 // commercial... until they are explicitly unlocked
312 return NULL; 492 return NULL;
342 float VMOptionsFuzzyMatchSimilarity = 0.7f; 522 float VMOptionsFuzzyMatchSimilarity = 0.7f;
343 Flag* match = NULL; 523 Flag* match = NULL;
344 float score; 524 float score;
345 float max_score = -1; 525 float max_score = -1;
346 526
347 for (Flag* current = &flagTable[0]; current->name != NULL; current++) { 527 for (Flag* current = &flagTable[0]; current->_name != NULL; current++) {
348 score = str_similar(current->name, name, length); 528 score = str_similar(current->_name, name, length);
349 if (score > max_score) { 529 if (score > max_score) {
350 max_score = score; 530 max_score = score;
351 match = current; 531 match = current;
352 } 532 }
353 } 533 }
372 } 552 }
373 553
374 bool CommandLineFlagsEx::is_default(CommandLineFlag flag) { 554 bool CommandLineFlagsEx::is_default(CommandLineFlag flag) {
375 assert((size_t)flag < Flag::numFlags, "bad command line flag index"); 555 assert((size_t)flag < Flag::numFlags, "bad command line flag index");
376 Flag* f = &Flag::flags[flag]; 556 Flag* f = &Flag::flags[flag];
377 return (f->origin == DEFAULT); 557 return f->is_default();
378 } 558 }
379 559
380 bool CommandLineFlagsEx::is_ergo(CommandLineFlag flag) { 560 bool CommandLineFlagsEx::is_ergo(CommandLineFlag flag) {
381 assert((size_t)flag < Flag::numFlags, "bad command line flag index"); 561 assert((size_t)flag < Flag::numFlags, "bad command line flag index");
382 Flag* f = &Flag::flags[flag]; 562 Flag* f = &Flag::flags[flag];
383 return (f->origin == ERGONOMIC); 563 return f->is_ergonomic();
384 } 564 }
385 565
386 bool CommandLineFlagsEx::is_cmdline(CommandLineFlag flag) { 566 bool CommandLineFlagsEx::is_cmdline(CommandLineFlag flag) {
387 assert((size_t)flag < Flag::numFlags, "bad command line flag index"); 567 assert((size_t)flag < Flag::numFlags, "bad command line flag index");
388 Flag* f = &Flag::flags[flag]; 568 Flag* f = &Flag::flags[flag];
389 return (f->origin == COMMAND_LINE); 569 return f->is_command_line();
390 } 570 }
391 571
392 bool CommandLineFlags::wasSetOnCmdline(const char* name, bool* value) { 572 bool CommandLineFlags::wasSetOnCmdline(const char* name, bool* value) {
393 Flag* result = Flag::find_flag((char*)name, strlen(name)); 573 Flag* result = Flag::find_flag((char*)name, strlen(name));
394 if (result == NULL) return false; 574 if (result == NULL) return false;
395 *value = (result->origin == COMMAND_LINE); 575 *value = result->is_command_line();
396 return true; 576 return true;
397 } 577 }
398 578
399 bool CommandLineFlags::boolAt(char* name, size_t len, bool* value) { 579 bool CommandLineFlags::boolAt(char* name, size_t len, bool* value) {
400 Flag* result = Flag::find_flag(name, len); 580 Flag* result = Flag::find_flag(name, len);
402 if (!result->is_bool()) return false; 582 if (!result->is_bool()) return false;
403 *value = result->get_bool(); 583 *value = result->get_bool();
404 return true; 584 return true;
405 } 585 }
406 586
407 bool CommandLineFlags::boolAtPut(char* name, size_t len, bool* value, FlagValueOrigin origin) { 587 bool CommandLineFlags::boolAtPut(char* name, size_t len, bool* value, Flag::Flags origin) {
408 Flag* result = Flag::find_flag(name, len); 588 Flag* result = Flag::find_flag(name, len);
409 if (result == NULL) return false; 589 if (result == NULL) return false;
410 if (!result->is_bool()) return false; 590 if (!result->is_bool()) return false;
411 bool old_value = result->get_bool(); 591 bool old_value = result->get_bool();
412 result->set_bool(*value); 592 result->set_bool(*value);
413 *value = old_value; 593 *value = old_value;
414 result->origin = origin; 594 result->set_origin(origin);
415 return true; 595 return true;
416 } 596 }
417 597
418 void CommandLineFlagsEx::boolAtPut(CommandLineFlagWithType flag, bool value, FlagValueOrigin origin) { 598 void CommandLineFlagsEx::boolAtPut(CommandLineFlagWithType flag, bool value, Flag::Flags origin) {
419 Flag* faddr = address_of_flag(flag); 599 Flag* faddr = address_of_flag(flag);
420 guarantee(faddr != NULL && faddr->is_bool(), "wrong flag type"); 600 guarantee(faddr != NULL && faddr->is_bool(), "wrong flag type");
421 faddr->set_bool(value); 601 faddr->set_bool(value);
422 faddr->origin = origin; 602 faddr->set_origin(origin);
423 } 603 }
424 604
425 bool CommandLineFlags::intxAt(char* name, size_t len, intx* value) { 605 bool CommandLineFlags::intxAt(char* name, size_t len, intx* value) {
426 Flag* result = Flag::find_flag(name, len); 606 Flag* result = Flag::find_flag(name, len);
427 if (result == NULL) return false; 607 if (result == NULL) return false;
428 if (!result->is_intx()) return false; 608 if (!result->is_intx()) return false;
429 *value = result->get_intx(); 609 *value = result->get_intx();
430 return true; 610 return true;
431 } 611 }
432 612
433 bool CommandLineFlags::intxAtPut(char* name, size_t len, intx* value, FlagValueOrigin origin) { 613 bool CommandLineFlags::intxAtPut(char* name, size_t len, intx* value, Flag::Flags origin) {
434 Flag* result = Flag::find_flag(name, len); 614 Flag* result = Flag::find_flag(name, len);
435 if (result == NULL) return false; 615 if (result == NULL) return false;
436 if (!result->is_intx()) return false; 616 if (!result->is_intx()) return false;
437 intx old_value = result->get_intx(); 617 intx old_value = result->get_intx();
438 result->set_intx(*value); 618 result->set_intx(*value);
439 *value = old_value; 619 *value = old_value;
440 result->origin = origin; 620 result->set_origin(origin);
441 return true; 621 return true;
442 } 622 }
443 623
444 void CommandLineFlagsEx::intxAtPut(CommandLineFlagWithType flag, intx value, FlagValueOrigin origin) { 624 void CommandLineFlagsEx::intxAtPut(CommandLineFlagWithType flag, intx value, Flag::Flags origin) {
445 Flag* faddr = address_of_flag(flag); 625 Flag* faddr = address_of_flag(flag);
446 guarantee(faddr != NULL && faddr->is_intx(), "wrong flag type"); 626 guarantee(faddr != NULL && faddr->is_intx(), "wrong flag type");
447 faddr->set_intx(value); 627 faddr->set_intx(value);
448 faddr->origin = origin; 628 faddr->set_origin(origin);
449 } 629 }
450 630
451 bool CommandLineFlags::uintxAt(char* name, size_t len, uintx* value) { 631 bool CommandLineFlags::uintxAt(char* name, size_t len, uintx* value) {
452 Flag* result = Flag::find_flag(name, len); 632 Flag* result = Flag::find_flag(name, len);
453 if (result == NULL) return false; 633 if (result == NULL) return false;
454 if (!result->is_uintx()) return false; 634 if (!result->is_uintx()) return false;
455 *value = result->get_uintx(); 635 *value = result->get_uintx();
456 return true; 636 return true;
457 } 637 }
458 638
459 bool CommandLineFlags::uintxAtPut(char* name, size_t len, uintx* value, FlagValueOrigin origin) { 639 bool CommandLineFlags::uintxAtPut(char* name, size_t len, uintx* value, Flag::Flags origin) {
460 Flag* result = Flag::find_flag(name, len); 640 Flag* result = Flag::find_flag(name, len);
461 if (result == NULL) return false; 641 if (result == NULL) return false;
462 if (!result->is_uintx()) return false; 642 if (!result->is_uintx()) return false;
463 uintx old_value = result->get_uintx(); 643 uintx old_value = result->get_uintx();
464 result->set_uintx(*value); 644 result->set_uintx(*value);
465 *value = old_value; 645 *value = old_value;
466 result->origin = origin; 646 result->set_origin(origin);
467 return true; 647 return true;
468 } 648 }
469 649
470 void CommandLineFlagsEx::uintxAtPut(CommandLineFlagWithType flag, uintx value, FlagValueOrigin origin) { 650 void CommandLineFlagsEx::uintxAtPut(CommandLineFlagWithType flag, uintx value, Flag::Flags origin) {
471 Flag* faddr = address_of_flag(flag); 651 Flag* faddr = address_of_flag(flag);
472 guarantee(faddr != NULL && faddr->is_uintx(), "wrong flag type"); 652 guarantee(faddr != NULL && faddr->is_uintx(), "wrong flag type");
473 faddr->set_uintx(value); 653 faddr->set_uintx(value);
474 faddr->origin = origin; 654 faddr->set_origin(origin);
475 } 655 }
476 656
477 bool CommandLineFlags::uint64_tAt(char* name, size_t len, uint64_t* value) { 657 bool CommandLineFlags::uint64_tAt(char* name, size_t len, uint64_t* value) {
478 Flag* result = Flag::find_flag(name, len); 658 Flag* result = Flag::find_flag(name, len);
479 if (result == NULL) return false; 659 if (result == NULL) return false;
480 if (!result->is_uint64_t()) return false; 660 if (!result->is_uint64_t()) return false;
481 *value = result->get_uint64_t(); 661 *value = result->get_uint64_t();
482 return true; 662 return true;
483 } 663 }
484 664
485 bool CommandLineFlags::uint64_tAtPut(char* name, size_t len, uint64_t* value, FlagValueOrigin origin) { 665 bool CommandLineFlags::uint64_tAtPut(char* name, size_t len, uint64_t* value, Flag::Flags origin) {
486 Flag* result = Flag::find_flag(name, len); 666 Flag* result = Flag::find_flag(name, len);
487 if (result == NULL) return false; 667 if (result == NULL) return false;
488 if (!result->is_uint64_t()) return false; 668 if (!result->is_uint64_t()) return false;
489 uint64_t old_value = result->get_uint64_t(); 669 uint64_t old_value = result->get_uint64_t();
490 result->set_uint64_t(*value); 670 result->set_uint64_t(*value);
491 *value = old_value; 671 *value = old_value;
492 result->origin = origin; 672 result->set_origin(origin);
493 return true; 673 return true;
494 } 674 }
495 675
496 void CommandLineFlagsEx::uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, FlagValueOrigin origin) { 676 void CommandLineFlagsEx::uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, Flag::Flags origin) {
497 Flag* faddr = address_of_flag(flag); 677 Flag* faddr = address_of_flag(flag);
498 guarantee(faddr != NULL && faddr->is_uint64_t(), "wrong flag type"); 678 guarantee(faddr != NULL && faddr->is_uint64_t(), "wrong flag type");
499 faddr->set_uint64_t(value); 679 faddr->set_uint64_t(value);
500 faddr->origin = origin; 680 faddr->set_origin(origin);
501 } 681 }
502 682
503 bool CommandLineFlags::doubleAt(char* name, size_t len, double* value) { 683 bool CommandLineFlags::doubleAt(char* name, size_t len, double* value) {
504 Flag* result = Flag::find_flag(name, len); 684 Flag* result = Flag::find_flag(name, len);
505 if (result == NULL) return false; 685 if (result == NULL) return false;
506 if (!result->is_double()) return false; 686 if (!result->is_double()) return false;
507 *value = result->get_double(); 687 *value = result->get_double();
508 return true; 688 return true;
509 } 689 }
510 690
511 bool CommandLineFlags::doubleAtPut(char* name, size_t len, double* value, FlagValueOrigin origin) { 691 bool CommandLineFlags::doubleAtPut(char* name, size_t len, double* value, Flag::Flags origin) {
512 Flag* result = Flag::find_flag(name, len); 692 Flag* result = Flag::find_flag(name, len);
513 if (result == NULL) return false; 693 if (result == NULL) return false;
514 if (!result->is_double()) return false; 694 if (!result->is_double()) return false;
515 double old_value = result->get_double(); 695 double old_value = result->get_double();
516 result->set_double(*value); 696 result->set_double(*value);
517 *value = old_value; 697 *value = old_value;
518 result->origin = origin; 698 result->set_origin(origin);
519 return true; 699 return true;
520 } 700 }
521 701
522 void CommandLineFlagsEx::doubleAtPut(CommandLineFlagWithType flag, double value, FlagValueOrigin origin) { 702 void CommandLineFlagsEx::doubleAtPut(CommandLineFlagWithType flag, double value, Flag::Flags origin) {
523 Flag* faddr = address_of_flag(flag); 703 Flag* faddr = address_of_flag(flag);
524 guarantee(faddr != NULL && faddr->is_double(), "wrong flag type"); 704 guarantee(faddr != NULL && faddr->is_double(), "wrong flag type");
525 faddr->set_double(value); 705 faddr->set_double(value);
526 faddr->origin = origin; 706 faddr->set_origin(origin);
527 } 707 }
528 708
529 bool CommandLineFlags::ccstrAt(char* name, size_t len, ccstr* value) { 709 bool CommandLineFlags::ccstrAt(char* name, size_t len, ccstr* value) {
530 Flag* result = Flag::find_flag(name, len); 710 Flag* result = Flag::find_flag(name, len);
531 if (result == NULL) return false; 711 if (result == NULL) return false;
534 return true; 714 return true;
535 } 715 }
536 716
537 // Contract: Flag will make private copy of the incoming value. 717 // Contract: Flag will make private copy of the incoming value.
538 // Outgoing value is always malloc-ed, and caller MUST call free. 718 // Outgoing value is always malloc-ed, and caller MUST call free.
539 bool CommandLineFlags::ccstrAtPut(char* name, size_t len, ccstr* value, FlagValueOrigin origin) { 719 bool CommandLineFlags::ccstrAtPut(char* name, size_t len, ccstr* value, Flag::Flags origin) {
540 Flag* result = Flag::find_flag(name, len); 720 Flag* result = Flag::find_flag(name, len);
541 if (result == NULL) return false; 721 if (result == NULL) return false;
542 if (!result->is_ccstr()) return false; 722 if (!result->is_ccstr()) return false;
543 ccstr old_value = result->get_ccstr(); 723 ccstr old_value = result->get_ccstr();
544 char* new_value = NULL; 724 char* new_value = NULL;
545 if (*value != NULL) { 725 if (*value != NULL) {
546 new_value = NEW_C_HEAP_ARRAY(char, strlen(*value)+1, mtInternal); 726 new_value = NEW_C_HEAP_ARRAY(char, strlen(*value)+1, mtInternal);
547 strcpy(new_value, *value); 727 strcpy(new_value, *value);
548 } 728 }
549 result->set_ccstr(new_value); 729 result->set_ccstr(new_value);
550 if (result->origin == DEFAULT && old_value != NULL) { 730 if (result->is_default() && old_value != NULL) {
551 // Prior value is NOT heap allocated, but was a literal constant. 731 // Prior value is NOT heap allocated, but was a literal constant.
552 char* old_value_to_free = NEW_C_HEAP_ARRAY(char, strlen(old_value)+1, mtInternal); 732 char* old_value_to_free = NEW_C_HEAP_ARRAY(char, strlen(old_value)+1, mtInternal);
553 strcpy(old_value_to_free, old_value); 733 strcpy(old_value_to_free, old_value);
554 old_value = old_value_to_free; 734 old_value = old_value_to_free;
555 } 735 }
556 *value = old_value; 736 *value = old_value;
557 result->origin = origin; 737 result->set_origin(origin);
558 return true; 738 return true;
559 } 739 }
560 740
561 // Contract: Flag will make private copy of the incoming value. 741 // Contract: Flag will make private copy of the incoming value.
562 void CommandLineFlagsEx::ccstrAtPut(CommandLineFlagWithType flag, ccstr value, FlagValueOrigin origin) { 742 void CommandLineFlagsEx::ccstrAtPut(CommandLineFlagWithType flag, ccstr value, Flag::Flags origin) {
563 Flag* faddr = address_of_flag(flag); 743 Flag* faddr = address_of_flag(flag);
564 guarantee(faddr != NULL && faddr->is_ccstr(), "wrong flag type"); 744 guarantee(faddr != NULL && faddr->is_ccstr(), "wrong flag type");
565 ccstr old_value = faddr->get_ccstr(); 745 ccstr old_value = faddr->get_ccstr();
566 char* new_value = NEW_C_HEAP_ARRAY(char, strlen(value)+1, mtInternal); 746 char* new_value = NEW_C_HEAP_ARRAY(char, strlen(value)+1, mtInternal);
567 strcpy(new_value, value); 747 strcpy(new_value, value);
568 faddr->set_ccstr(new_value); 748 faddr->set_ccstr(new_value);
569 if (faddr->origin != DEFAULT && old_value != NULL) { 749 if (!faddr->is_default() && old_value != NULL) {
570 // Prior value is heap allocated so free it. 750 // Prior value is heap allocated so free it.
571 FREE_C_HEAP_ARRAY(char, old_value, mtInternal); 751 FREE_C_HEAP_ARRAY(char, old_value, mtInternal);
572 } 752 }
573 faddr->origin = origin; 753 faddr->set_origin(origin);
574 } 754 }
575 755
576 extern "C" { 756 extern "C" {
577 static int compare_flags(const void* void_a, const void* void_b) { 757 static int compare_flags(const void* void_a, const void* void_b) {
578 return strcmp((*((Flag**) void_a))->name, (*((Flag**) void_b))->name); 758 return strcmp((*((Flag**) void_a))->_name, (*((Flag**) void_b))->_name);
579 } 759 }
580 } 760 }
581 761
582 void CommandLineFlags::printSetFlags(outputStream* out) { 762 void CommandLineFlags::printSetFlags(outputStream* out) {
583 // Print which flags were set on the command line 763 // Print which flags were set on the command line
584 // note: this method is called before the thread structure is in place 764 // note: this method is called before the thread structure is in place
585 // which means resource allocation cannot be used. 765 // which means resource allocation cannot be used.
586 766
587 // Compute size 767 // The last entry is the null entry.
588 int length= 0; 768 const size_t length = Flag::numFlags - 1;
589 while (flagTable[length].name != NULL) length++;
590 769
591 // Sort 770 // Sort
592 Flag** array = NEW_C_HEAP_ARRAY(Flag*, length, mtInternal); 771 Flag** array = NEW_C_HEAP_ARRAY(Flag*, length, mtInternal);
593 for (int index = 0; index < length; index++) { 772 for (size_t i = 0; i < length; i++) {
594 array[index] = &flagTable[index]; 773 array[i] = &flagTable[i];
595 } 774 }
596 qsort(array, length, sizeof(Flag*), compare_flags); 775 qsort(array, length, sizeof(Flag*), compare_flags);
597 776
598 // Print 777 // Print
599 for (int i = 0; i < length; i++) { 778 for (size_t i = 0; i < length; i++) {
600 if (array[i]->origin /* naked field! */) { 779 if (array[i]->get_origin() /* naked field! */) {
601 array[i]->print_as_flag(out); 780 array[i]->print_as_flag(out);
602 out->print(" "); 781 out->print(" ");
603 } 782 }
604 } 783 }
605 out->cr(); 784 out->cr();
618 void CommandLineFlags::printFlags(outputStream* out, bool withComments) { 797 void CommandLineFlags::printFlags(outputStream* out, bool withComments) {
619 // Print the flags sorted by name 798 // Print the flags sorted by name
620 // note: this method is called before the thread structure is in place 799 // note: this method is called before the thread structure is in place
621 // which means resource allocation cannot be used. 800 // which means resource allocation cannot be used.
622 801
623 // Compute size 802 // The last entry is the null entry.
624 int length= 0; 803 const size_t length = Flag::numFlags - 1;
625 while (flagTable[length].name != NULL) length++;
626 804
627 // Sort 805 // Sort
628 Flag** array = NEW_C_HEAP_ARRAY(Flag*, length, mtInternal); 806 Flag** array = NEW_C_HEAP_ARRAY(Flag*, length, mtInternal);
629 for (int index = 0; index < length; index++) { 807 for (size_t i = 0; i < length; i++) {
630 array[index] = &flagTable[index]; 808 array[i] = &flagTable[i];
631 } 809 }
632 qsort(array, length, sizeof(Flag*), compare_flags); 810 qsort(array, length, sizeof(Flag*), compare_flags);
633 811
634 // Print 812 // Print
635 out->print_cr("[Global flags]"); 813 out->print_cr("[Global flags]");
636 for (int i = 0; i < length; i++) { 814 for (size_t i = 0; i < length; i++) {
637 if (array[i]->is_unlocked()) { 815 if (array[i]->is_unlocked()) {
638 array[i]->print_on(out, withComments); 816 array[i]->print_on(out, withComments);
639 } 817 }
640 } 818 }
641 FREE_C_HEAP_ARRAY(Flag*, array, mtInternal); 819 FREE_C_HEAP_ARRAY(Flag*, array, mtInternal);