mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-22 20:14:43 +02:00
Merge
This commit is contained in:
commit
2cb284f394
15 changed files with 93 additions and 52 deletions
1
.hgtags
1
.hgtags
|
@ -81,3 +81,4 @@ c4c8a5bc54f66abc68cd185d9294042121922154 jdk7-b99
|
|||
10bc903a228d3a8efdf46fb8c3fcf82a59b88bc5 jdk7-b104
|
||||
1ce7938efb03224ccc8b3cdd7803eb39e889539c jdk7-b105
|
||||
6bdae472f77205046703b685eff2ac4f7a0ecf4e jdk7-b106
|
||||
439de530aac531a360beedba6e2fe51e17292cc0 jdk7-b107
|
||||
|
|
|
@ -81,3 +81,4 @@ be2aedc4e3b1751c1310f334242ba69e90867f38 jdk7-b103
|
|||
f8be576feefce0c6695f188ef97ec16b73ad9cfd jdk7-b104
|
||||
9f96a4269d7727dad68864eaab795eafce270311 jdk7-b105
|
||||
43096cccf1cee749c2f4e7714ee71f4e9e0f4d7f jdk7-b106
|
||||
7d396ad455c3b2f68b0d7094891c5aba7c757a6e jdk7-b107
|
||||
|
|
|
@ -81,3 +81,4 @@ a56d734a1e970e1a21a8f4feb13053e9a33674c7 jdk7-b100
|
|||
9607213481d400ac477183191cc080e1bef6f475 jdk7-b104
|
||||
6f21b030092fb61244cc8a0aedf8058f7c022b81 jdk7-b105
|
||||
519daea48888196af76a975a3b31258efa860bad jdk7-b106
|
||||
232adb83eae8375439ccff65b6e205ca0da0510d jdk7-b107
|
||||
|
|
|
@ -114,4 +114,6 @@ b4acf10eb134fe930802c97e36db65e7ccb544b5 jdk7-b104
|
|||
1b81ca701fa5fc30adc4cfdaa4bdd153df5e6c86 jdk7-b106
|
||||
cc3fdfeb54b049f18edcf3463e6ab051d0b7b609 hs19-b05
|
||||
688a538aa65412178286ae2a6b0c00b6711e121b hs19-b06
|
||||
bf496cbe9b74dda5975a1559da7ecfdd313e509e jdk7-b107
|
||||
0000000000000000000000000000000000000000 hs19-b06
|
||||
6c43216df13513a0f96532aa06f213066c49e27b hs19-b06
|
||||
|
|
|
@ -33,9 +33,9 @@
|
|||
# Don't put quotes (fail windows build).
|
||||
HOTSPOT_VM_COPYRIGHT=Copyright 2010
|
||||
|
||||
HS_MAJOR_VER=19
|
||||
HS_MAJOR_VER=20
|
||||
HS_MINOR_VER=0
|
||||
HS_BUILD_NUMBER=06
|
||||
HS_BUILD_NUMBER=01
|
||||
|
||||
JDK_MAJOR_VER=1
|
||||
JDK_MINOR_VER=7
|
||||
|
|
|
@ -47,6 +47,7 @@ jprt.sync.push=false
|
|||
# Define the Solaris platforms we want for the various releases
|
||||
|
||||
jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
|
||||
jprt.my.solaris.sparc.jdk7b107=solaris_sparc_5.10
|
||||
jprt.my.solaris.sparc.jdk6=solaris_sparc_5.8
|
||||
jprt.my.solaris.sparc.jdk6perf=solaris_sparc_5.8
|
||||
jprt.my.solaris.sparc.jdk6u10=solaris_sparc_5.8
|
||||
|
@ -56,6 +57,7 @@ jprt.my.solaris.sparc.jdk6u20=solaris_sparc_5.8
|
|||
jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
|
||||
|
||||
jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
|
||||
jprt.my.solaris.sparcv9.jdk7b107=solaris_sparcv9_5.10
|
||||
jprt.my.solaris.sparcv9.jdk6=solaris_sparcv9_5.8
|
||||
jprt.my.solaris.sparcv9.jdk6perf=solaris_sparcv9_5.8
|
||||
jprt.my.solaris.sparcv9.jdk6u10=solaris_sparcv9_5.8
|
||||
|
@ -65,6 +67,7 @@ jprt.my.solaris.sparcv9.jdk6u20=solaris_sparcv9_5.8
|
|||
jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
|
||||
|
||||
jprt.my.solaris.i586.jdk7=solaris_i586_5.10
|
||||
jprt.my.solaris.i586.jdk7b107=solaris_i586_5.10
|
||||
jprt.my.solaris.i586.jdk6=solaris_i586_5.8
|
||||
jprt.my.solaris.i586.jdk6perf=solaris_i586_5.8
|
||||
jprt.my.solaris.i586.jdk6u10=solaris_i586_5.8
|
||||
|
@ -74,6 +77,7 @@ jprt.my.solaris.i586.jdk6u20=solaris_i586_5.8
|
|||
jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
|
||||
|
||||
jprt.my.solaris.x64.jdk7=solaris_x64_5.10
|
||||
jprt.my.solaris.x64.jdk7b107=solaris_x64_5.10
|
||||
jprt.my.solaris.x64.jdk6=solaris_x64_5.10
|
||||
jprt.my.solaris.x64.jdk6perf=solaris_x64_5.10
|
||||
jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10
|
||||
|
@ -83,6 +87,7 @@ jprt.my.solaris.x64.jdk6u20=solaris_x64_5.10
|
|||
jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
|
||||
|
||||
jprt.my.linux.i586.jdk7=linux_i586_2.6
|
||||
jprt.my.linux.i586.jdk7b107=linux_i586_2.6
|
||||
jprt.my.linux.i586.jdk6=linux_i586_2.4
|
||||
jprt.my.linux.i586.jdk6perf=linux_i586_2.4
|
||||
jprt.my.linux.i586.jdk6u10=linux_i586_2.4
|
||||
|
@ -92,6 +97,7 @@ jprt.my.linux.i586.jdk6u20=linux_i586_2.4
|
|||
jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
|
||||
|
||||
jprt.my.linux.x64.jdk7=linux_x64_2.6
|
||||
jprt.my.linux.x64.jdk7b107=linux_x64_2.6
|
||||
jprt.my.linux.x64.jdk6=linux_x64_2.4
|
||||
jprt.my.linux.x64.jdk6perf=linux_x64_2.4
|
||||
jprt.my.linux.x64.jdk6u10=linux_x64_2.4
|
||||
|
@ -101,6 +107,7 @@ jprt.my.linux.x64.jdk6u20=linux_x64_2.4
|
|||
jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
|
||||
|
||||
jprt.my.windows.i586.jdk7=windows_i586_5.0
|
||||
jprt.my.windows.i586.jdk7b107=windows_i586_5.0
|
||||
jprt.my.windows.i586.jdk6=windows_i586_5.0
|
||||
jprt.my.windows.i586.jdk6perf=windows_i586_5.0
|
||||
jprt.my.windows.i586.jdk6u10=windows_i586_5.0
|
||||
|
@ -110,6 +117,7 @@ jprt.my.windows.i586.jdk6u20=windows_i586_5.0
|
|||
jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
|
||||
|
||||
jprt.my.windows.x64.jdk7=windows_x64_5.2
|
||||
jprt.my.windows.x64.jdk7b107=windows_x64_5.2
|
||||
jprt.my.windows.x64.jdk6=windows_x64_5.2
|
||||
jprt.my.windows.x64.jdk6perf=windows_x64_5.2
|
||||
jprt.my.windows.x64.jdk6u10=windows_x64_5.2
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
|
@ -152,6 +152,7 @@ void StackMapTable::print() const {
|
|||
|
||||
int32_t StackMapReader::chop(
|
||||
VerificationType* locals, int32_t length, int32_t chops) {
|
||||
if (locals == NULL) return -1;
|
||||
int32_t pos = length - 1;
|
||||
for (int32_t i=0; i<chops; i++) {
|
||||
if (locals[pos].is_category2_2nd()) {
|
||||
|
|
|
@ -2858,6 +2858,13 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
|
|||
CommandLineFlags::printFlags();
|
||||
vm_exit(0);
|
||||
}
|
||||
|
||||
#ifndef PRODUCT
|
||||
if (match_option(option, "-XX:+PrintFlagsWithComments", &tail)) {
|
||||
CommandLineFlags::printFlags(true);
|
||||
vm_exit(0);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
if (IgnoreUnrecognizedVMOptions) {
|
||||
|
|
|
@ -68,12 +68,14 @@ bool Flag::is_external() const {
|
|||
// Length of format string (e.g. "%.1234s") for printing ccstr below
|
||||
#define FORMAT_BUFFER_LEN 16
|
||||
|
||||
void Flag::print_on(outputStream* st) {
|
||||
st->print("%5s %-35s %c= ", type, name, (origin != DEFAULT ? ':' : ' '));
|
||||
void Flag::print_on(outputStream* st, bool withComments) {
|
||||
st->print("%9s %-40s %c= ", type, name, (origin != DEFAULT ? ':' : ' '));
|
||||
if (is_bool()) st->print("%-16s", get_bool() ? "true" : "false");
|
||||
if (is_intx()) st->print("%-16ld", get_intx());
|
||||
if (is_uintx()) st->print("%-16lu", get_uintx());
|
||||
if (is_uint64_t()) st->print("%-16lu", get_uint64_t());
|
||||
if (is_double()) st->print("%-16f", get_double());
|
||||
|
||||
if (is_ccstr()) {
|
||||
const char* cp = get_ccstr();
|
||||
if (cp != NULL) {
|
||||
|
@ -90,8 +92,14 @@ void Flag::print_on(outputStream* st) {
|
|||
}
|
||||
st->print("%-16s", cp);
|
||||
}
|
||||
else st->print("%-16s", "");
|
||||
}
|
||||
st->print("%-20s", kind);
|
||||
if (withComments) {
|
||||
#ifndef PRODUCT
|
||||
st->print("%s", doc );
|
||||
#endif
|
||||
}
|
||||
st->print(" %s", kind);
|
||||
st->cr();
|
||||
}
|
||||
|
||||
|
@ -131,67 +139,67 @@ void Flag::print_as_flag(outputStream* st) {
|
|||
// 4991491 do not "optimize out" the was_set false values: omitting them
|
||||
// tickles a Microsoft compiler bug causing flagTable to be malformed
|
||||
|
||||
#define RUNTIME_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{product}", DEFAULT },
|
||||
#define RUNTIME_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, "{pd product}", DEFAULT },
|
||||
#define RUNTIME_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{diagnostic}", DEFAULT },
|
||||
#define RUNTIME_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{experimental}", DEFAULT },
|
||||
#define RUNTIME_MANAGEABLE_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{manageable}", DEFAULT },
|
||||
#define RUNTIME_PRODUCT_RW_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{product rw}", DEFAULT },
|
||||
#define RUNTIME_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{product}", DEFAULT },
|
||||
#define RUNTIME_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{pd product}", DEFAULT },
|
||||
#define RUNTIME_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{diagnostic}", DEFAULT },
|
||||
#define RUNTIME_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{experimental}", DEFAULT },
|
||||
#define RUNTIME_MANAGEABLE_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{manageable}", DEFAULT },
|
||||
#define RUNTIME_PRODUCT_RW_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{product rw}", DEFAULT },
|
||||
|
||||
#ifdef PRODUCT
|
||||
#define RUNTIME_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
|
||||
#define RUNTIME_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */
|
||||
#define RUNTIME_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc)
|
||||
#else
|
||||
#define RUNTIME_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "", DEFAULT },
|
||||
#define RUNTIME_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, "{pd}", DEFAULT },
|
||||
#define RUNTIME_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{notproduct}", DEFAULT },
|
||||
#define RUNTIME_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "", DEFAULT },
|
||||
#define RUNTIME_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{pd}", DEFAULT },
|
||||
#define RUNTIME_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{notproduct}", DEFAULT },
|
||||
#endif
|
||||
|
||||
#ifdef _LP64
|
||||
#define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{lp64_product}", DEFAULT },
|
||||
#define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{lp64_product}", DEFAULT },
|
||||
#else
|
||||
#define RUNTIME_LP64_PRODUCT_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
|
||||
#endif // _LP64
|
||||
|
||||
#define C1_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C1 product}", DEFAULT },
|
||||
#define C1_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, "{C1 pd product}", DEFAULT },
|
||||
#define C1_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C1 product}", DEFAULT },
|
||||
#define C1_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C1 pd product}", DEFAULT },
|
||||
#ifdef PRODUCT
|
||||
#define C1_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
|
||||
#define C1_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */
|
||||
#define C1_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc)
|
||||
#else
|
||||
#define C1_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C1}", DEFAULT },
|
||||
#define C1_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, "{C1 pd}", DEFAULT },
|
||||
#define C1_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C1 notproduct}", DEFAULT },
|
||||
#define C1_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C1}", DEFAULT },
|
||||
#define C1_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{C1 pd}", DEFAULT },
|
||||
#define C1_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C1 notproduct}", DEFAULT },
|
||||
#endif
|
||||
|
||||
|
||||
#define C2_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C2 product}", DEFAULT },
|
||||
#define C2_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, "{C2 pd product}", DEFAULT },
|
||||
#define C2_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C2 diagnostic}", DEFAULT },
|
||||
#define C2_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C2 experimental}", DEFAULT },
|
||||
#define C2_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 product}", DEFAULT },
|
||||
#define C2_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 pd product}", DEFAULT },
|
||||
#define C2_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 diagnostic}", DEFAULT },
|
||||
#define C2_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{C2 experimental}", DEFAULT },
|
||||
#ifdef PRODUCT
|
||||
#define C2_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
|
||||
#define C2_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */
|
||||
#define C2_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc)
|
||||
#else
|
||||
#define C2_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C2}", DEFAULT },
|
||||
#define C2_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, "{C2 pd}", DEFAULT },
|
||||
#define C2_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{C2 notproduct}", DEFAULT },
|
||||
#define C2_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C2}", DEFAULT },
|
||||
#define C2_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{C2 pd}", DEFAULT },
|
||||
#define C2_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{C2 notproduct}", DEFAULT },
|
||||
#endif
|
||||
|
||||
#define SHARK_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{Shark product}", DEFAULT },
|
||||
#define SHARK_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, "{Shark pd product}", DEFAULT },
|
||||
#define SHARK_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{Shark diagnostic}", DEFAULT },
|
||||
#define SHARK_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Shark product}", DEFAULT },
|
||||
#define SHARK_PD_PRODUCT_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Shark pd product}", DEFAULT },
|
||||
#define SHARK_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{Shark diagnostic}", DEFAULT },
|
||||
#ifdef PRODUCT
|
||||
#define SHARK_DEVELOP_FLAG_STRUCT(type, name, value, doc) /* flag is constant */
|
||||
#define SHARK_PD_DEVELOP_FLAG_STRUCT(type, name, doc) /* flag is constant */
|
||||
#define SHARK_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc)
|
||||
#else
|
||||
#define SHARK_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{Shark}", DEFAULT },
|
||||
#define SHARK_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, "{Shark pd}", DEFAULT },
|
||||
#define SHARK_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, "{Shark notproduct}", DEFAULT },
|
||||
#define SHARK_DEVELOP_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{Shark}", DEFAULT },
|
||||
#define SHARK_PD_DEVELOP_FLAG_STRUCT(type, name, doc) { #type, XSTR(name), &name, doc, "{Shark pd}", DEFAULT },
|
||||
#define SHARK_NOTPRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, doc, "{Shark notproduct}", DEFAULT },
|
||||
#endif
|
||||
|
||||
static Flag flagTable[] = {
|
||||
|
@ -485,7 +493,7 @@ void CommandLineFlags::verify() {
|
|||
|
||||
#endif // PRODUCT
|
||||
|
||||
void CommandLineFlags::printFlags() {
|
||||
void CommandLineFlags::printFlags(bool withComments) {
|
||||
// Print the flags sorted by name
|
||||
// note: this method is called before the thread structure is in place
|
||||
// which means resource allocation cannot be used.
|
||||
|
@ -505,7 +513,7 @@ void CommandLineFlags::printFlags() {
|
|||
tty->print_cr("[Global flags]");
|
||||
for (int i = 0; i < length; i++) {
|
||||
if (array[i]->is_unlocked()) {
|
||||
array[i]->print_on(tty);
|
||||
array[i]->print_on(tty, withComments);
|
||||
}
|
||||
}
|
||||
FREE_C_HEAP_ARRAY(Flag*, array);
|
||||
|
|
|
@ -90,6 +90,9 @@ struct Flag {
|
|||
const char *type;
|
||||
const char *name;
|
||||
void* addr;
|
||||
|
||||
NOT_PRODUCT(const char *doc;)
|
||||
|
||||
const char *kind;
|
||||
FlagValueOrigin origin;
|
||||
|
||||
|
@ -131,7 +134,7 @@ struct Flag {
|
|||
bool is_writeable() const;
|
||||
bool is_external() const;
|
||||
|
||||
void print_on(outputStream* st);
|
||||
void print_on(outputStream* st, bool withComments = false );
|
||||
void print_as_flag(outputStream* st);
|
||||
};
|
||||
|
||||
|
@ -211,7 +214,7 @@ class CommandLineFlags {
|
|||
static bool wasSetOnCmdline(const char* name, bool* value);
|
||||
static void printSetFlags();
|
||||
|
||||
static void printFlags();
|
||||
static void printFlags(bool withComments = false );
|
||||
|
||||
static void verify() PRODUCT_RETURN;
|
||||
};
|
||||
|
@ -2406,6 +2409,9 @@ class CommandLineFlags {
|
|||
product(bool, PrintFlagsFinal, false, \
|
||||
"Print all VM flags after argument and ergonomic processing") \
|
||||
\
|
||||
notproduct(bool, PrintFlagsWithComments, false, \
|
||||
"Print all VM flags with default values and descriptions and exit")\
|
||||
\
|
||||
diagnostic(bool, SerializeVMOutput, true, \
|
||||
"Use a mutex to serialize output to tty and hotspot.log") \
|
||||
\
|
||||
|
|
|
@ -76,12 +76,14 @@
|
|||
#ifdef PRODUCT
|
||||
#define PRODUCT_ONLY(code) code
|
||||
#define NOT_PRODUCT(code)
|
||||
#define NOT_PRODUCT_ARG(arg)
|
||||
#define PRODUCT_RETURN {}
|
||||
#define PRODUCT_RETURN0 { return 0; }
|
||||
#define PRODUCT_RETURN_(code) { code }
|
||||
#else // PRODUCT
|
||||
#define PRODUCT_ONLY(code)
|
||||
#define NOT_PRODUCT(code) code
|
||||
#define NOT_PRODUCT_ARG(arg) arg,
|
||||
#define PRODUCT_RETURN /*next token must be ;*/
|
||||
#define PRODUCT_RETURN0 /*next token must be ;*/
|
||||
#define PRODUCT_RETURN_(code) /*next token must be ;*/
|
||||
|
|
|
@ -81,3 +81,4 @@ b7722e8788644507c10bb69a137de422d0300b24 jdk7-b103
|
|||
d42c4acb6424a094bdafe2ad9c8c1c7ca7fb7b7e jdk7-b104
|
||||
3233b9a4c12ef2663a356d08bb141c02736c7f49 jdk7-b105
|
||||
5ba8469212a6cab95ca652eea414b753be7d245a jdk7-b106
|
||||
20ee37c1372a3eaefa49b426c6eb68a2e8f5d6e2 jdk7-b107
|
||||
|
|
|
@ -81,3 +81,4 @@ d8580443d1815d68e0035a0560634e50fa899288 jdk7-b102
|
|||
bbc4cce6c20aeca4862804a6e8315a2350d43633 jdk7-b104
|
||||
39eb4f3031f4a985664cace00fca3bd1eab1e0aa jdk7-b105
|
||||
bc45ccc5bcca6cbe4ea433e279d4a93b06ab38c6 jdk7-b106
|
||||
017612ea6af417a5e378619704da01bb3a583bdb jdk7-b107
|
||||
|
|
|
@ -81,3 +81,4 @@ d58354a69011f3d3354765fa3167567c4c4a9612 jdk7-b101
|
|||
1a92820132a0221c5bdedd42d0888c57ce4cbb34 jdk7-b104
|
||||
3b0abcb512807bb6f6d27755bc50103211bde6ee jdk7-b105
|
||||
b91ef6b60f4e19bf4592c6dd594c9bac62487519 jdk7-b106
|
||||
882103f334bb23745d3fd70fb7928c347478b0f4 jdk7-b107
|
||||
|
|
|
@ -81,3 +81,4 @@ bd85271c580ce4600b1b2d5598daa19d02174cf7 jdk7-b103
|
|||
fc7219517ec16b28d729d259020a25b05ffdf0b6 jdk7-b104
|
||||
aaecac256d39c7cb536e70d20ddd833fc118e43a jdk7-b105
|
||||
112fcc00659dda1a356ec75d964584e4dae0228f jdk7-b106
|
||||
2c1c657f69a4ff608a43e1ac61baf3294cd55797 jdk7-b107
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue