src/share/vm/runtime/globals.hpp

changeset 6472
2b8e28fdf503
parent 6470
abe03600372a
parent 5987
5ccbab1c69f3
child 6485
da862781b584
     1.1 --- a/src/share/vm/runtime/globals.hpp	Wed Oct 16 10:52:41 2013 +0200
     1.2 +++ b/src/share/vm/runtime/globals.hpp	Tue Nov 05 17:38:04 2013 -0800
     1.3 @@ -208,29 +208,49 @@
     1.4  typedef const char* ccstr;
     1.5  typedef const char* ccstrlist;   // represents string arguments which accumulate
     1.6  
     1.7 -enum FlagValueOrigin {
     1.8 -  DEFAULT          = 0,
     1.9 -  COMMAND_LINE     = 1,
    1.10 -  ENVIRON_VAR      = 2,
    1.11 -  CONFIG_FILE      = 3,
    1.12 -  MANAGEMENT       = 4,
    1.13 -  ERGONOMIC        = 5,
    1.14 -  ATTACH_ON_DEMAND = 6,
    1.15 -  INTERNAL         = 99
    1.16 -};
    1.17 +struct Flag {
    1.18 +  enum Flags {
    1.19 +    // value origin
    1.20 +    DEFAULT          = 0,
    1.21 +    COMMAND_LINE     = 1,
    1.22 +    ENVIRON_VAR      = 2,
    1.23 +    CONFIG_FILE      = 3,
    1.24 +    MANAGEMENT       = 4,
    1.25 +    ERGONOMIC        = 5,
    1.26 +    ATTACH_ON_DEMAND = 6,
    1.27 +    INTERNAL         = 7,
    1.28  
    1.29 -struct Flag {
    1.30 -  const char *type;
    1.31 -  const char *name;
    1.32 -  void*       addr;
    1.33 +    LAST_VALUE_ORIGIN = INTERNAL,
    1.34 +    VALUE_ORIGIN_BITS = 4,
    1.35 +    VALUE_ORIGIN_MASK = right_n_bits(VALUE_ORIGIN_BITS),
    1.36  
    1.37 -  NOT_PRODUCT(const char *doc;)
    1.38 +    // flag kind
    1.39 +    KIND_PRODUCT            = 1 << 4,
    1.40 +    KIND_MANAGEABLE         = 1 << 5,
    1.41 +    KIND_DIAGNOSTIC         = 1 << 6,
    1.42 +    KIND_EXPERIMENTAL       = 1 << 7,
    1.43 +    KIND_NOT_PRODUCT        = 1 << 8,
    1.44 +    KIND_DEVELOP            = 1 << 9,
    1.45 +    KIND_PLATFORM_DEPENDENT = 1 << 10,
    1.46 +    KIND_READ_WRITE         = 1 << 11,
    1.47 +    KIND_C1                 = 1 << 12,
    1.48 +    KIND_C2                 = 1 << 13,
    1.49 +    KIND_ARCH               = 1 << 14,
    1.50 +    KIND_SHARK              = 1 << 15,
    1.51 +    KIND_LP64_PRODUCT       = 1 << 16,
    1.52 +    KIND_COMMERCIAL         = 1 << 17,
    1.53  
    1.54 -  const char *kind;
    1.55 -  FlagValueOrigin origin;
    1.56 +    KIND_MASK = ~VALUE_ORIGIN_MASK
    1.57 +  };
    1.58 +
    1.59 +  const char* _type;
    1.60 +  const char* _name;
    1.61 +  void* _addr;
    1.62 +  NOT_PRODUCT(const char* _doc;)
    1.63 +  Flags _flags;
    1.64  
    1.65    // points to all Flags static array
    1.66 -  static Flag *flags;
    1.67 +  static Flag* flags;
    1.68  
    1.69    // number of flags
    1.70    static size_t numFlags;
    1.71 @@ -238,30 +258,50 @@
    1.72    static Flag* find_flag(const char* name, size_t length, bool allow_locked = false);
    1.73    static Flag* fuzzy_match(const char* name, size_t length, bool allow_locked = false);
    1.74  
    1.75 -  bool is_bool() const        { return strcmp(type, "bool") == 0; }
    1.76 -  bool get_bool() const       { return *((bool*) addr); }
    1.77 -  void set_bool(bool value)   { *((bool*) addr) = value; }
    1.78 +  void check_writable();
    1.79  
    1.80 -  bool is_intx()  const       { return strcmp(type, "intx")  == 0; }
    1.81 -  intx get_intx() const       { return *((intx*) addr); }
    1.82 -  void set_intx(intx value)   { *((intx*) addr) = value; }
    1.83 +  bool is_bool() const;
    1.84 +  bool get_bool() const;
    1.85 +  void set_bool(bool value);
    1.86  
    1.87 -  bool is_uintx() const       { return strcmp(type, "uintx") == 0; }
    1.88 -  uintx get_uintx() const     { return *((uintx*) addr); }
    1.89 -  void set_uintx(uintx value) { *((uintx*) addr) = value; }
    1.90 +  bool is_intx() const;
    1.91 +  intx get_intx() const;
    1.92 +  void set_intx(intx value);
    1.93  
    1.94 -  bool is_uint64_t() const          { return strcmp(type, "uint64_t") == 0; }
    1.95 -  uint64_t get_uint64_t() const     { return *((uint64_t*) addr); }
    1.96 -  void set_uint64_t(uint64_t value) { *((uint64_t*) addr) = value; }
    1.97 +  bool is_uintx() const;
    1.98 +  uintx get_uintx() const;
    1.99 +  void set_uintx(uintx value);
   1.100  
   1.101 -  bool is_double() const        { return strcmp(type, "double") == 0; }
   1.102 -  double get_double() const     { return *((double*) addr); }
   1.103 -  void set_double(double value) { *((double*) addr) = value; }
   1.104 +  bool is_uint64_t() const;
   1.105 +  uint64_t get_uint64_t() const;
   1.106 +  void set_uint64_t(uint64_t value);
   1.107  
   1.108 -  bool is_ccstr() const          { return strcmp(type, "ccstr") == 0 || strcmp(type, "ccstrlist") == 0; }
   1.109 -  bool ccstr_accumulates() const { return strcmp(type, "ccstrlist") == 0; }
   1.110 -  ccstr get_ccstr() const     { return *((ccstr*) addr); }
   1.111 -  void set_ccstr(ccstr value) { *((ccstr*) addr) = value; }
   1.112 +  bool is_double() const;
   1.113 +  double get_double() const;
   1.114 +  void set_double(double value);
   1.115 +
   1.116 +  bool is_ccstr() const;
   1.117 +  bool ccstr_accumulates() const;
   1.118 +  ccstr get_ccstr() const;
   1.119 +  void set_ccstr(ccstr value);
   1.120 +
   1.121 +  Flags get_origin();
   1.122 +  void set_origin(Flags origin);
   1.123 +
   1.124 +  bool is_default();
   1.125 +  bool is_ergonomic();
   1.126 +  bool is_command_line();
   1.127 +
   1.128 +  bool is_product() const;
   1.129 +  bool is_manageable() const;
   1.130 +  bool is_diagnostic() const;
   1.131 +  bool is_experimental() const;
   1.132 +  bool is_notproduct() const;
   1.133 +  bool is_develop() const;
   1.134 +  bool is_read_write() const;
   1.135 +  bool is_commercial() const;
   1.136 +
   1.137 +  bool is_constant_in_binary() const;
   1.138  
   1.139    bool is_unlocker() const;
   1.140    bool is_unlocked() const;
   1.141 @@ -277,6 +317,7 @@
   1.142    void get_locked_message_ext(char*, int) const;
   1.143  
   1.144    void print_on(outputStream* st, bool withComments = false );
   1.145 +  void print_kind(outputStream* st);
   1.146    void print_as_flag(outputStream* st);
   1.147  };
   1.148  
   1.149 @@ -324,33 +365,33 @@
   1.150   public:
   1.151    static bool boolAt(char* name, size_t len, bool* value);
   1.152    static bool boolAt(char* name, bool* value)      { return boolAt(name, strlen(name), value); }
   1.153 -  static bool boolAtPut(char* name, size_t len, bool* value, FlagValueOrigin origin);
   1.154 -  static bool boolAtPut(char* name, bool* value, FlagValueOrigin origin)   { return boolAtPut(name, strlen(name), value, origin); }
   1.155 +  static bool boolAtPut(char* name, size_t len, bool* value, Flag::Flags origin);
   1.156 +  static bool boolAtPut(char* name, bool* value, Flag::Flags origin)   { return boolAtPut(name, strlen(name), value, origin); }
   1.157  
   1.158    static bool intxAt(char* name, size_t len, intx* value);
   1.159    static bool intxAt(char* name, intx* value)      { return intxAt(name, strlen(name), value); }
   1.160 -  static bool intxAtPut(char* name, size_t len, intx* value, FlagValueOrigin origin);
   1.161 -  static bool intxAtPut(char* name, intx* value, FlagValueOrigin origin)   { return intxAtPut(name, strlen(name), value, origin); }
   1.162 +  static bool intxAtPut(char* name, size_t len, intx* value, Flag::Flags origin);
   1.163 +  static bool intxAtPut(char* name, intx* value, Flag::Flags origin)   { return intxAtPut(name, strlen(name), value, origin); }
   1.164  
   1.165    static bool uintxAt(char* name, size_t len, uintx* value);
   1.166    static bool uintxAt(char* name, uintx* value)    { return uintxAt(name, strlen(name), value); }
   1.167 -  static bool uintxAtPut(char* name, size_t len, uintx* value, FlagValueOrigin origin);
   1.168 -  static bool uintxAtPut(char* name, uintx* value, FlagValueOrigin origin) { return uintxAtPut(name, strlen(name), value, origin); }
   1.169 +  static bool uintxAtPut(char* name, size_t len, uintx* value, Flag::Flags origin);
   1.170 +  static bool uintxAtPut(char* name, uintx* value, Flag::Flags origin) { return uintxAtPut(name, strlen(name), value, origin); }
   1.171  
   1.172    static bool uint64_tAt(char* name, size_t len, uint64_t* value);
   1.173    static bool uint64_tAt(char* name, uint64_t* value) { return uint64_tAt(name, strlen(name), value); }
   1.174 -  static bool uint64_tAtPut(char* name, size_t len, uint64_t* value, FlagValueOrigin origin);
   1.175 -  static bool uint64_tAtPut(char* name, uint64_t* value, FlagValueOrigin origin) { return uint64_tAtPut(name, strlen(name), value, origin); }
   1.176 +  static bool uint64_tAtPut(char* name, size_t len, uint64_t* value, Flag::Flags origin);
   1.177 +  static bool uint64_tAtPut(char* name, uint64_t* value, Flag::Flags origin) { return uint64_tAtPut(name, strlen(name), value, origin); }
   1.178  
   1.179    static bool doubleAt(char* name, size_t len, double* value);
   1.180    static bool doubleAt(char* name, double* value)    { return doubleAt(name, strlen(name), value); }
   1.181 -  static bool doubleAtPut(char* name, size_t len, double* value, FlagValueOrigin origin);
   1.182 -  static bool doubleAtPut(char* name, double* value, FlagValueOrigin origin) { return doubleAtPut(name, strlen(name), value, origin); }
   1.183 +  static bool doubleAtPut(char* name, size_t len, double* value, Flag::Flags origin);
   1.184 +  static bool doubleAtPut(char* name, double* value, Flag::Flags origin) { return doubleAtPut(name, strlen(name), value, origin); }
   1.185  
   1.186    static bool ccstrAt(char* name, size_t len, ccstr* value);
   1.187    static bool ccstrAt(char* name, ccstr* value)    { return ccstrAt(name, strlen(name), value); }
   1.188 -  static bool ccstrAtPut(char* name, size_t len, ccstr* value, FlagValueOrigin origin);
   1.189 -  static bool ccstrAtPut(char* name, ccstr* value, FlagValueOrigin origin) { return ccstrAtPut(name, strlen(name), value, origin); }
   1.190 +  static bool ccstrAtPut(char* name, size_t len, ccstr* value, Flag::Flags origin);
   1.191 +  static bool ccstrAtPut(char* name, ccstr* value, Flag::Flags origin) { return ccstrAtPut(name, strlen(name), value, origin); }
   1.192  
   1.193    // Returns false if name is not a command line flag.
   1.194    static bool wasSetOnCmdline(const char* name, bool* value);
   1.195 @@ -454,21 +495,21 @@
   1.196  #define RUNTIME_FLAGS(develop, develop_pd, product, product_pd, diagnostic, experimental, notproduct, manageable, product_rw, lp64_product) \
   1.197                                                                              \
   1.198    lp64_product(bool, UseCompressedOops, false,                              \
   1.199 -            "Use 32-bit object references in 64-bit VM  "                   \
   1.200 -            "lp64_product means flag is always constant in 32 bit VM")      \
   1.201 -                                                                            \
   1.202 -  lp64_product(bool, UseCompressedKlassPointers, false,                     \
   1.203 -            "Use 32-bit klass pointers in 64-bit VM  "                      \
   1.204 -            "lp64_product means flag is always constant in 32 bit VM")      \
   1.205 +          "Use 32-bit object references in 64-bit VM. "                     \
   1.206 +          "lp64_product means flag is always constant in 32 bit VM")        \
   1.207 +                                                                            \
   1.208 +  lp64_product(bool, UseCompressedClassPointers, false,                     \
   1.209 +          "Use 32-bit class pointers in 64-bit VM. "                        \
   1.210 +          "lp64_product means flag is always constant in 32 bit VM")        \
   1.211                                                                              \
   1.212    notproduct(bool, CheckCompressedOops, true,                               \
   1.213 -            "generate checks in encoding/decoding code in debug VM")        \
   1.214 +          "Generate checks in encoding/decoding code in debug VM")          \
   1.215                                                                              \
   1.216    product_pd(uintx, HeapBaseMinAddress,                                     \
   1.217 -            "OS specific low limit for heap base address")                  \
   1.218 +          "OS specific low limit for heap base address")                    \
   1.219                                                                              \
   1.220    diagnostic(bool, PrintCompressedOopsMode, false,                          \
   1.221 -            "Print compressed oops base address and encoding mode")         \
   1.222 +          "Print compressed oops base address and encoding mode")           \
   1.223                                                                              \
   1.224    lp64_product(intx, ObjectAlignmentInBytes, 8,                             \
   1.225            "Default object alignment in bytes, 8 is minimum")                \
   1.226 @@ -490,7 +531,7 @@
   1.227            "Use lwsync instruction if true, else use slower sync")           \
   1.228                                                                              \
   1.229    develop(bool, CleanChunkPoolAsync, falseInEmbedded,                       \
   1.230 -          "Whether to clean the chunk pool asynchronously")                 \
   1.231 +          "Clean the chunk pool asynchronously")                            \
   1.232                                                                              \
   1.233    /* Temporary: See 6948537 */                                              \
   1.234    experimental(bool, UseMemSetInBOT, true,                                  \
   1.235 @@ -500,10 +541,12 @@
   1.236            "Enable normal processing of flags relating to field diagnostics")\
   1.237                                                                              \
   1.238    experimental(bool, UnlockExperimentalVMOptions, false,                    \
   1.239 -          "Enable normal processing of flags relating to experimental features")\
   1.240 +          "Enable normal processing of flags relating to experimental "     \
   1.241 +          "features")                                                       \
   1.242                                                                              \
   1.243    product(bool, JavaMonitorsInStackTrace, true,                             \
   1.244 -          "Print info. about Java monitor locks when the stacks are dumped")\
   1.245 +          "Print information about Java monitor locks when the stacks are"  \
   1.246 +          "dumped")                                                         \
   1.247                                                                              \
   1.248    product_pd(bool, UseLargePages,                                           \
   1.249            "Use large page memory")                                          \
   1.250 @@ -514,8 +557,12 @@
   1.251    develop(bool, LargePagesIndividualAllocationInjectError, false,           \
   1.252            "Fail large pages individual allocation")                         \
   1.253                                                                              \
   1.254 +  product(bool, UseLargePagesInMetaspace, false,                            \
   1.255 +          "Use large page memory in metaspace. "                            \
   1.256 +          "Only used if UseLargePages is enabled.")                         \
   1.257 +                                                                            \
   1.258    develop(bool, TracePageSizes, false,                                      \
   1.259 -          "Trace page size selection and usage.")                           \
   1.260 +          "Trace page size selection and usage")                            \
   1.261                                                                              \
   1.262    product(bool, UseNUMA, false,                                             \
   1.263            "Use NUMA if available")                                          \
   1.264 @@ -530,12 +577,12 @@
   1.265            "Force NUMA optimizations on single-node/UMA systems")            \
   1.266                                                                              \
   1.267    product(uintx, NUMAChunkResizeWeight, 20,                                 \
   1.268 -          "Percentage (0-100) used to weigh the current sample when "      \
   1.269 +          "Percentage (0-100) used to weigh the current sample when "       \
   1.270            "computing exponentially decaying average for "                   \
   1.271            "AdaptiveNUMAChunkSizing")                                        \
   1.272                                                                              \
   1.273    product(uintx, NUMASpaceResizeRate, 1*G,                                  \
   1.274 -          "Do not reallocate more that this amount per collection")         \
   1.275 +          "Do not reallocate more than this amount per collection")         \
   1.276                                                                              \
   1.277    product(bool, UseAdaptiveNUMAChunkSizing, true,                           \
   1.278            "Enable adaptive chunk sizing for NUMA")                          \
   1.279 @@ -552,17 +599,17 @@
   1.280    product(intx, UseSSE, 99,                                                 \
   1.281            "Highest supported SSE instructions set on x86/x64")              \
   1.282                                                                              \
   1.283 -  product(bool, UseAES, false,                                               \
   1.284 +  product(bool, UseAES, false,                                              \
   1.285            "Control whether AES instructions can be used on x86/x64")        \
   1.286                                                                              \
   1.287    product(uintx, LargePageSizeInBytes, 0,                                   \
   1.288 -          "Large page size (0 to let VM choose the page size")              \
   1.289 +          "Large page size (0 to let VM choose the page size)")             \
   1.290                                                                              \
   1.291    product(uintx, LargePageHeapSizeThreshold, 128*M,                         \
   1.292 -          "Use large pages if max heap is at least this big")               \
   1.293 +          "Use large pages if maximum heap is at least this big")           \
   1.294                                                                              \
   1.295    product(bool, ForceTimeHighResolution, false,                             \
   1.296 -          "Using high time resolution(For Win32 only)")                     \
   1.297 +          "Using high time resolution (for Win32 only)")                    \
   1.298                                                                              \
   1.299    develop(bool, TraceItables, false,                                        \
   1.300            "Trace initialization and use of itables")                        \
   1.301 @@ -578,10 +625,10 @@
   1.302                                                                              \
   1.303    develop(bool, TraceLongCompiles, false,                                   \
   1.304            "Print out every time compilation is longer than "                \
   1.305 -          "a given threashold")                                             \
   1.306 +          "a given threshold")                                              \
   1.307                                                                              \
   1.308    develop(bool, SafepointALot, false,                                       \
   1.309 -          "Generates a lot of safepoints. Works with "                      \
   1.310 +          "Generate a lot of safepoints. This works with "                  \
   1.311            "GuaranteedSafepointInterval")                                    \
   1.312                                                                              \
   1.313    product_pd(bool, BackgroundCompilation,                                   \
   1.314 @@ -589,13 +636,13 @@
   1.315            "compilation")                                                    \
   1.316                                                                              \
   1.317    product(bool, PrintVMQWaitTime, false,                                    \
   1.318 -          "Prints out the waiting time in VM operation queue")              \
   1.319 +          "Print out the waiting time in VM operation queue")               \
   1.320                                                                              \
   1.321    develop(bool, NoYieldsInMicrolock, false,                                 \
   1.322            "Disable yields in microlock")                                    \
   1.323                                                                              \
   1.324    develop(bool, TraceOopMapGeneration, false,                               \
   1.325 -          "Shows oopmap generation")                                        \
   1.326 +          "Show OopMapGeneration")                                          \
   1.327                                                                              \
   1.328    product(bool, MethodFlushing, true,                                       \
   1.329            "Reclamation of zombie and not-entrant methods")                  \
   1.330 @@ -604,10 +651,11 @@
   1.331            "Verify stack of each thread when it is entering a runtime call") \
   1.332                                                                              \
   1.333    diagnostic(bool, ForceUnreachable, false,                                 \
   1.334 -          "Make all non code cache addresses to be unreachable with forcing use of 64bit literal fixups") \
   1.335 +          "Make all non code cache addresses to be unreachable by "         \
   1.336 +          "forcing use of 64bit literal fixups")                            \
   1.337                                                                              \
   1.338    notproduct(bool, StressDerivedPointers, false,                            \
   1.339 -          "Force scavenge when a derived pointers is detected on stack "    \
   1.340 +          "Force scavenge when a derived pointer is detected on stack "     \
   1.341            "after rtm call")                                                 \
   1.342                                                                              \
   1.343    develop(bool, TraceDerivedPointers, false,                                \
   1.344 @@ -626,86 +674,86 @@
   1.345            "Use Inline Caches for virtual calls ")                           \
   1.346                                                                              \
   1.347    develop(bool, InlineArrayCopy, true,                                      \
   1.348 -          "inline arraycopy native that is known to be part of "            \
   1.349 +          "Inline arraycopy native that is known to be part of "            \
   1.350            "base library DLL")                                               \
   1.351                                                                              \
   1.352    develop(bool, InlineObjectHash, true,                                     \
   1.353 -          "inline Object::hashCode() native that is known to be part "      \
   1.354 +          "Inline Object::hashCode() native that is known to be part "      \
   1.355            "of base library DLL")                                            \
   1.356                                                                              \
   1.357    develop(bool, InlineNatives, true,                                        \
   1.358 -          "inline natives that are known to be part of base library DLL")   \
   1.359 +          "Inline natives that are known to be part of base library DLL")   \
   1.360                                                                              \
   1.361    develop(bool, InlineMathNatives, true,                                    \
   1.362 -          "inline SinD, CosD, etc.")                                        \
   1.363 +          "Inline SinD, CosD, etc.")                                        \
   1.364                                                                              \
   1.365    develop(bool, InlineClassNatives, true,                                   \
   1.366 -          "inline Class.isInstance, etc")                                   \
   1.367 +          "Inline Class.isInstance, etc")                                   \
   1.368                                                                              \
   1.369    develop(bool, InlineThreadNatives, true,                                  \
   1.370 -          "inline Thread.currentThread, etc")                               \
   1.371 +          "Inline Thread.currentThread, etc")                               \
   1.372                                                                              \
   1.373    develop(bool, InlineUnsafeOps, true,                                      \
   1.374 -          "inline memory ops (native methods) from sun.misc.Unsafe")        \
   1.375 +          "Inline memory ops (native methods) from sun.misc.Unsafe")        \
   1.376                                                                              \
   1.377    product(bool, CriticalJNINatives, true,                                   \
   1.378 -          "check for critical JNI entry points")                            \
   1.379 +          "Check for critical JNI entry points")                            \
   1.380                                                                              \
   1.381    notproduct(bool, StressCriticalJNINatives, false,                         \
   1.382 -            "Exercise register saving code in critical natives")            \
   1.383 +          "Exercise register saving code in critical natives")              \
   1.384                                                                              \
   1.385    product(bool, UseSSE42Intrinsics, false,                                  \
   1.386            "SSE4.2 versions of intrinsics")                                  \
   1.387                                                                              \
   1.388    product(bool, UseAESIntrinsics, false,                                    \
   1.389 -          "use intrinsics for AES versions of crypto")                      \
   1.390 +          "Use intrinsics for AES versions of crypto")                      \
   1.391                                                                              \
   1.392    product(bool, UseCRC32Intrinsics, false,                                  \
   1.393            "use intrinsics for java.util.zip.CRC32")                         \
   1.394                                                                              \
   1.395    develop(bool, TraceCallFixup, false,                                      \
   1.396 -          "traces all call fixups")                                         \
   1.397 +          "Trace all call fixups")                                          \
   1.398                                                                              \
   1.399    develop(bool, DeoptimizeALot, false,                                      \
   1.400 -          "deoptimize at every exit from the runtime system")               \
   1.401 +          "Deoptimize at every exit from the runtime system")               \
   1.402                                                                              \
   1.403    notproduct(ccstrlist, DeoptimizeOnlyAt, "",                               \
   1.404 -          "a comma separated list of bcis to deoptimize at")                \
   1.405 +          "A comma separated list of bcis to deoptimize at")                \
   1.406                                                                              \
   1.407    product(bool, DeoptimizeRandom, false,                                    \
   1.408 -          "deoptimize random frames on random exit from the runtime system")\
   1.409 +          "Deoptimize random frames on random exit from the runtime system")\
   1.410                                                                              \
   1.411    notproduct(bool, ZombieALot, false,                                       \
   1.412 -          "creates zombies (non-entrant) at exit from the runt. system")    \
   1.413 +          "Create zombies (non-entrant) at exit from the runtime system")   \
   1.414                                                                              \
   1.415    product(bool, UnlinkSymbolsALot, false,                                   \
   1.416 -          "unlink unreferenced symbols from the symbol table at safepoints")\
   1.417 +          "Unlink unreferenced symbols from the symbol table at safepoints")\
   1.418                                                                              \
   1.419    notproduct(bool, WalkStackALot, false,                                    \
   1.420 -          "trace stack (no print) at every exit from the runtime system")   \
   1.421 +          "Trace stack (no print) at every exit from the runtime system")   \
   1.422                                                                              \
   1.423    product(bool, Debugging, false,                                           \
   1.424 -          "set when executing debug methods in debug.ccp "                  \
   1.425 +          "Set when executing debug methods in debug.cpp "                  \
   1.426            "(to prevent triggering assertions)")                             \
   1.427                                                                              \
   1.428    notproduct(bool, StrictSafepointChecks, trueInDebug,                      \
   1.429            "Enable strict checks that safepoints cannot happen for threads " \
   1.430 -          "that used No_Safepoint_Verifier")                                \
   1.431 +          "that use No_Safepoint_Verifier")                                 \
   1.432                                                                              \
   1.433    notproduct(bool, VerifyLastFrame, false,                                  \
   1.434            "Verify oops on last frame on entry to VM")                       \
   1.435                                                                              \
   1.436    develop(bool, TraceHandleAllocation, false,                               \
   1.437 -          "Prints out warnings when suspicious many handles are allocated") \
   1.438 +          "Print out warnings when suspiciously many handles are allocated")\
   1.439                                                                              \
   1.440    product(bool, UseCompilerSafepoints, true,                                \
   1.441            "Stop at safepoints in compiled code")                            \
   1.442                                                                              \
   1.443    product(bool, FailOverToOldVerifier, true,                                \
   1.444 -          "fail over to old verifier when split verifier fails")            \
   1.445 +          "Fail over to old verifier when split verifier fails")            \
   1.446                                                                              \
   1.447    develop(bool, ShowSafepointMsgs, false,                                   \
   1.448 -          "Show msg. about safepoint synch.")                               \
   1.449 +          "Show message about safepoint synchronization")                   \
   1.450                                                                              \
   1.451    product(bool, SafepointTimeout, false,                                    \
   1.452            "Time out and warn or fail after SafepointTimeoutDelay "          \
   1.453 @@ -729,19 +777,19 @@
   1.454            "Trace external suspend wait failures")                           \
   1.455                                                                              \
   1.456    product(bool, MaxFDLimit, true,                                           \
   1.457 -          "Bump the number of file descriptors to max in solaris.")         \
   1.458 +          "Bump the number of file descriptors to maximum in Solaris")      \
   1.459                                                                              \
   1.460    diagnostic(bool, LogEvents, true,                                         \
   1.461 -             "Enable the various ring buffer event logs")                   \
   1.462 +          "Enable the various ring buffer event logs")                      \
   1.463                                                                              \
   1.464    diagnostic(uintx, LogEventsBufferEntries, 10,                             \
   1.465 -             "Enable the various ring buffer event logs")                   \
   1.466 +          "Number of ring buffer event logs")                               \
   1.467                                                                              \
   1.468    product(bool, BytecodeVerificationRemote, true,                           \
   1.469 -          "Enables the Java bytecode verifier for remote classes")          \
   1.470 +          "Enable the Java bytecode verifier for remote classes")           \
   1.471                                                                              \
   1.472    product(bool, BytecodeVerificationLocal, false,                           \
   1.473 -          "Enables the Java bytecode verifier for local classes")           \
   1.474 +          "Enable the Java bytecode verifier for local classes")            \
   1.475                                                                              \
   1.476    develop(bool, ForceFloatExceptions, trueInDebug,                          \
   1.477            "Force exceptions on FP stack under/overflow")                    \
   1.478 @@ -753,7 +801,7 @@
   1.479            "Trace java language assertions")                                 \
   1.480                                                                              \
   1.481    notproduct(bool, CheckAssertionStatusDirectives, false,                   \
   1.482 -          "temporary - see javaClasses.cpp")                                \
   1.483 +          "Temporary - see javaClasses.cpp")                                \
   1.484                                                                              \
   1.485    notproduct(bool, PrintMallocFree, false,                                  \
   1.486            "Trace calls to C heap malloc/free allocation")                   \
   1.487 @@ -772,16 +820,16 @@
   1.488            "entering the VM")                                                \
   1.489                                                                              \
   1.490    notproduct(bool, CheckOopishValues, false,                                \
   1.491 -          "Warn if value contains oop ( requires ZapDeadLocals)")           \
   1.492 +          "Warn if value contains oop (requires ZapDeadLocals)")            \
   1.493                                                                              \
   1.494    develop(bool, UseMallocOnly, false,                                       \
   1.495 -          "use only malloc/free for allocation (no resource area/arena)")   \
   1.496 +          "Use only malloc/free for allocation (no resource area/arena)")   \
   1.497                                                                              \
   1.498    develop(bool, PrintMalloc, false,                                         \
   1.499 -          "print all malloc/free calls")                                    \
   1.500 +          "Print all malloc/free calls")                                    \
   1.501                                                                              \
   1.502    develop(bool, PrintMallocStatistics, false,                               \
   1.503 -          "print malloc/free statistics")                                   \
   1.504 +          "Print malloc/free statistics")                                   \
   1.505                                                                              \
   1.506    develop(bool, ZapResourceArea, trueInDebug,                               \
   1.507            "Zap freed resource/arena space with 0xABABABAB")                 \
   1.508 @@ -793,7 +841,7 @@
   1.509            "Zap freed JNI handle space with 0xFEFEFEFE")                     \
   1.510                                                                              \
   1.511    notproduct(bool, ZapStackSegments, trueInDebug,                           \
   1.512 -             "Zap allocated/freed Stack segments with 0xFADFADED")          \
   1.513 +          "Zap allocated/freed stack segments with 0xFADFADED")             \
   1.514                                                                              \
   1.515    develop(bool, ZapUnusedHeapArea, trueInDebug,                             \
   1.516            "Zap unused heap space with 0xBAADBABE")                          \
   1.517 @@ -808,7 +856,7 @@
   1.518            "Zap filler objects with 0xDEAFBABE")                             \
   1.519                                                                              \
   1.520    develop(bool, PrintVMMessages, true,                                      \
   1.521 -          "Print vm messages on console")                                   \
   1.522 +          "Print VM messages on console")                                   \
   1.523                                                                              \
   1.524    product(bool, PrintGCApplicationConcurrentTime, false,                    \
   1.525            "Print the time the application has been running")                \
   1.526 @@ -817,21 +865,21 @@
   1.527            "Print the time the application has been stopped")                \
   1.528                                                                              \
   1.529    diagnostic(bool, VerboseVerification, false,                              \
   1.530 -             "Display detailed verification details")                       \
   1.531 +          "Display detailed verification details")                          \
   1.532                                                                              \
   1.533    notproduct(uintx, ErrorHandlerTest, 0,                                    \
   1.534 -          "If > 0, provokes an error after VM initialization; the value"    \
   1.535 -          "determines which error to provoke.  See test_error_handler()"    \
   1.536 +          "If > 0, provokes an error after VM initialization; the value "   \
   1.537 +          "determines which error to provoke. See test_error_handler() "    \
   1.538            "in debug.cpp.")                                                  \
   1.539                                                                              \
   1.540    develop(bool, Verbose, false,                                             \
   1.541 -          "Prints additional debugging information from other modes")       \
   1.542 +          "Print additional debugging information from other modes")        \
   1.543                                                                              \
   1.544    develop(bool, PrintMiscellaneous, false,                                  \
   1.545 -          "Prints uncategorized debugging information (requires +Verbose)") \
   1.546 +          "Print uncategorized debugging information (requires +Verbose)")  \
   1.547                                                                              \
   1.548    develop(bool, WizardMode, false,                                          \
   1.549 -          "Prints much more debugging information")                         \
   1.550 +          "Print much more debugging information")                          \
   1.551                                                                              \
   1.552    product(bool, ShowMessageBoxOnError, false,                               \
   1.553            "Keep process alive on VM fatal error")                           \
   1.554 @@ -843,7 +891,7 @@
   1.555            "Let VM fatal error propagate to the OS (ie. WER on Windows)")    \
   1.556                                                                              \
   1.557    product(bool, SuppressFatalErrorMessage, false,                           \
   1.558 -          "Do NO Fatal Error report [Avoid deadlock]")                      \
   1.559 +          "Report NO fatal error message (avoid deadlock)")                 \
   1.560                                                                              \
   1.561    product(ccstrlist, OnError, "",                                           \
   1.562            "Run user-defined commands on fatal error; see VMError.cpp "      \
   1.563 @@ -853,17 +901,17 @@
   1.564            "Run user-defined commands on first java.lang.OutOfMemoryError")  \
   1.565                                                                              \
   1.566    manageable(bool, HeapDumpBeforeFullGC, false,                             \
   1.567 -          "Dump heap to file before any major stop-world GC")               \
   1.568 +          "Dump heap to file before any major stop-the-world GC")           \
   1.569                                                                              \
   1.570    manageable(bool, HeapDumpAfterFullGC, false,                              \
   1.571 -          "Dump heap to file after any major stop-world GC")                \
   1.572 +          "Dump heap to file after any major stop-the-world GC")            \
   1.573                                                                              \
   1.574    manageable(bool, HeapDumpOnOutOfMemoryError, false,                       \
   1.575            "Dump heap to file when java.lang.OutOfMemoryError is thrown")    \
   1.576                                                                              \
   1.577    manageable(ccstr, HeapDumpPath, NULL,                                     \
   1.578 -          "When HeapDumpOnOutOfMemoryError is on, the path (filename or"    \
   1.579 -          "directory) of the dump file (defaults to java_pid<pid>.hprof"    \
   1.580 +          "When HeapDumpOnOutOfMemoryError is on, the path (filename or "   \
   1.581 +          "directory) of the dump file (defaults to java_pid<pid>.hprof "   \
   1.582            "in the working directory)")                                      \
   1.583                                                                              \
   1.584    develop(uintx, SegmentedHeapDumpThreshold, 2*G,                           \
   1.585 @@ -877,10 +925,10 @@
   1.586            "Execute breakpoint upon encountering VM warning")                \
   1.587                                                                              \
   1.588    develop(bool, TraceVMOperation, false,                                    \
   1.589 -          "Trace vm operations")                                            \
   1.590 +          "Trace VM operations")                                            \
   1.591                                                                              \
   1.592    develop(bool, UseFakeTimers, false,                                       \
   1.593 -          "Tells whether the VM should use system time or a fake timer")    \
   1.594 +          "Tell whether the VM should use system time or a fake timer")     \
   1.595                                                                              \
   1.596    product(ccstr, NativeMemoryTracking, "off",                               \
   1.597            "Native memory tracking options")                                 \
   1.598 @@ -890,22 +938,22 @@
   1.599                                                                              \
   1.600    diagnostic(bool, AutoShutdownNMT, true,                                   \
   1.601            "Automatically shutdown native memory tracking under stress "     \
   1.602 -          "situation. When set to false, native memory tracking tries to "  \
   1.603 +          "situations. When set to false, native memory tracking tries to " \
   1.604            "stay alive at the expense of JVM performance")                   \
   1.605                                                                              \
   1.606    diagnostic(bool, LogCompilation, false,                                   \
   1.607 -          "Log compilation activity in detail to hotspot.log or LogFile")   \
   1.608 +          "Log compilation activity in detail to LogFile")                  \
   1.609                                                                              \
   1.610    product(bool, PrintCompilation, false,                                    \
   1.611            "Print compilations")                                             \
   1.612                                                                              \
   1.613    diagnostic(bool, TraceNMethodInstalls, false,                             \
   1.614 -             "Trace nmethod intallation")                                   \
   1.615 +          "Trace nmethod installation")                                     \
   1.616                                                                              \
   1.617    diagnostic(intx, ScavengeRootsInCode, 2,                                  \
   1.618 -             "0: do not allow scavengable oops in the code cache; "         \
   1.619 -             "1: allow scavenging from the code cache; "                    \
   1.620 -             "2: emit as many constants as the compiler can see")           \
   1.621 +          "0: do not allow scavengable oops in the code cache; "            \
   1.622 +          "1: allow scavenging from the code cache; "                       \
   1.623 +          "2: emit as many constants as the compiler can see")              \
   1.624                                                                              \
   1.625    product(bool, AlwaysRestoreFPU, false,                                    \
   1.626            "Restore the FPU control word after every JNI call (expensive)")  \
   1.627 @@ -926,7 +974,7 @@
   1.628            "Print assembly code (using external disassembler.so)")           \
   1.629                                                                              \
   1.630    diagnostic(ccstr, PrintAssemblyOptions, NULL,                             \
   1.631 -          "Options string passed to disassembler.so")                       \
   1.632 +          "Print options string passed to disassembler.so")                 \
   1.633                                                                              \
   1.634    diagnostic(bool, PrintNMethods, false,                                    \
   1.635            "Print assembly code for nmethods when generated")                \
   1.636 @@ -947,20 +995,21 @@
   1.637            "Print exception handler tables for all nmethods when generated") \
   1.638                                                                              \
   1.639    develop(bool, StressCompiledExceptionHandlers, false,                     \
   1.640 -         "Exercise compiled exception handlers")                            \
   1.641 +          "Exercise compiled exception handlers")                           \
   1.642                                                                              \
   1.643    develop(bool, InterceptOSException, false,                                \
   1.644 -          "Starts debugger when an implicit OS (e.g., NULL) "               \
   1.645 +          "Start debugger when an implicit OS (e.g. NULL) "                 \
   1.646            "exception happens")                                              \
   1.647                                                                              \
   1.648    product(bool, PrintCodeCache, false,                                      \
   1.649            "Print the code cache memory usage when exiting")                 \
   1.650                                                                              \
   1.651    develop(bool, PrintCodeCache2, false,                                     \
   1.652 -          "Print detailed usage info on the code cache when exiting")       \
   1.653 +          "Print detailed usage information on the code cache when exiting")\
   1.654                                                                              \
   1.655    product(bool, PrintCodeCacheOnCompilation, false,                         \
   1.656 -          "Print the code cache memory usage each time a method is compiled") \
   1.657 +          "Print the code cache memory usage each time a method is "        \
   1.658 +          "compiled")                                                       \
   1.659                                                                              \
   1.660    diagnostic(bool, PrintStubCode, false,                                    \
   1.661            "Print generated stub code")                                      \
   1.662 @@ -972,40 +1021,40 @@
   1.663            "Omit backtraces for some 'hot' exceptions in optimized code")    \
   1.664                                                                              \
   1.665    product(bool, ProfilerPrintByteCodeStatistics, false,                     \
   1.666 -          "Prints byte code statictics when dumping profiler output")       \
   1.667 +          "Print bytecode statistics when dumping profiler output")         \
   1.668                                                                              \
   1.669    product(bool, ProfilerRecordPC, false,                                    \
   1.670 -          "Collects tick for each 16 byte interval of compiled code")       \
   1.671 +          "Collect ticks for each 16 byte interval of compiled code")       \
   1.672                                                                              \
   1.673    product(bool, ProfileVM, false,                                           \
   1.674 -          "Profiles ticks that fall within VM (either in the VM Thread "    \
   1.675 +          "Profile ticks that fall within VM (either in the VM Thread "     \
   1.676            "or VM code called through stubs)")                               \
   1.677                                                                              \
   1.678    product(bool, ProfileIntervals, false,                                    \
   1.679 -          "Prints profiles for each interval (see ProfileIntervalsTicks)")  \
   1.680 +          "Print profiles for each interval (see ProfileIntervalsTicks)")   \
   1.681                                                                              \
   1.682    notproduct(bool, ProfilerCheckIntervals, false,                           \
   1.683 -          "Collect and print info on spacing of profiler ticks")            \
   1.684 +          "Collect and print information on spacing of profiler ticks")     \
   1.685                                                                              \
   1.686    develop(bool, PrintJVMWarnings, false,                                    \
   1.687 -          "Prints warnings for unimplemented JVM functions")                \
   1.688 +          "Print warnings for unimplemented JVM functions")                 \
   1.689                                                                              \
   1.690    product(bool, PrintWarnings, true,                                        \
   1.691 -          "Prints JVM warnings to output stream")                           \
   1.692 +          "Print JVM warnings to output stream")                            \
   1.693                                                                              \
   1.694    notproduct(uintx, WarnOnStalledSpinLock, 0,                               \
   1.695 -          "Prints warnings for stalled SpinLocks")                          \
   1.696 +          "Print warnings for stalled SpinLocks")                           \
   1.697                                                                              \
   1.698    product(bool, RegisterFinalizersAtInit, true,                             \
   1.699            "Register finalizable objects at end of Object.<init> or "        \
   1.700            "after allocation")                                               \
   1.701                                                                              \
   1.702    develop(bool, RegisterReferences, true,                                   \
   1.703 -          "Tells whether the VM should register soft/weak/final/phantom "   \
   1.704 +          "Tell whether the VM should register soft/weak/final/phantom "    \
   1.705            "references")                                                     \
   1.706                                                                              \
   1.707    develop(bool, IgnoreRewrites, false,                                      \
   1.708 -          "Supress rewrites of bytecodes in the oopmap generator. "         \
   1.709 +          "Suppress rewrites of bytecodes in the oopmap generator. "        \
   1.710            "This is unsafe!")                                                \
   1.711                                                                              \
   1.712    develop(bool, PrintCodeCacheExtension, false,                             \
   1.713 @@ -1015,8 +1064,7 @@
   1.714            "Enable the security JVM functions")                              \
   1.715                                                                              \
   1.716    develop(bool, ProtectionDomainVerification, true,                         \
   1.717 -          "Verifies protection domain before resolution in system "         \
   1.718 -          "dictionary")                                                     \
   1.719 +          "Verify protection domain before resolution in system dictionary")\
   1.720                                                                              \
   1.721    product(bool, ClassUnloading, true,                                       \
   1.722            "Do unloading of classes")                                        \
   1.723 @@ -1029,14 +1077,14 @@
   1.724            "Write memory usage profiling to log file")                       \
   1.725                                                                              \
   1.726    notproduct(bool, PrintSystemDictionaryAtExit, false,                      \
   1.727 -          "Prints the system dictionary at exit")                           \
   1.728 +          "Print the system dictionary at exit")                            \
   1.729                                                                              \
   1.730    experimental(intx, PredictedLoadedClassCount, 0,                          \
   1.731 -          "Experimental: Tune loaded class cache starting size.")           \
   1.732 +          "Experimental: Tune loaded class cache starting size")            \
   1.733                                                                              \
   1.734    diagnostic(bool, UnsyncloadClass, false,                                  \
   1.735            "Unstable: VM calls loadClass unsynchronized. Custom "            \
   1.736 -          "class loader  must call VM synchronized for findClass "          \
   1.737 +          "class loader must call VM synchronized for findClass "           \
   1.738            "and defineClass.")                                               \
   1.739                                                                              \
   1.740    product(bool, AlwaysLockClassLoader, false,                               \
   1.741 @@ -1052,22 +1100,22 @@
   1.742            "Call loadClassInternal() rather than loadClass()")               \
   1.743                                                                              \
   1.744    product_pd(bool, DontYieldALot,                                           \
   1.745 -          "Throw away obvious excess yield calls (for SOLARIS only)")       \
   1.746 +          "Throw away obvious excess yield calls (for Solaris only)")       \
   1.747                                                                              \
   1.748    product_pd(bool, ConvertSleepToYield,                                     \
   1.749 -          "Converts sleep(0) to thread yield "                              \
   1.750 -          "(may be off for SOLARIS to improve GUI)")                        \
   1.751 +          "Convert sleep(0) to thread yield "                               \
   1.752 +          "(may be off for Solaris to improve GUI)")                        \
   1.753                                                                              \
   1.754    product(bool, ConvertYieldToSleep, false,                                 \
   1.755 -          "Converts yield to a sleep of MinSleepInterval to simulate Win32 "\
   1.756 -          "behavior (SOLARIS only)")                                        \
   1.757 +          "Convert yield to a sleep of MinSleepInterval to simulate Win32 " \
   1.758 +          "behavior (Solaris only)")                                        \
   1.759                                                                              \
   1.760    product(bool, UseBoundThreads, true,                                      \
   1.761 -          "Bind user level threads to kernel threads (for SOLARIS only)")   \
   1.762 +          "Bind user level threads to kernel threads (for Solaris only)")   \
   1.763                                                                              \
   1.764    develop(bool, UseDetachedThreads, true,                                   \
   1.765            "Use detached threads that are recycled upon termination "        \
   1.766 -          "(for SOLARIS only)")                                             \
   1.767 +          "(for Solaris only)")                                             \
   1.768                                                                              \
   1.769    product(bool, UseLWPSynchronization, true,                                \
   1.770            "Use LWP-based instead of libthread-based synchronization "       \
   1.771 @@ -1077,41 +1125,43 @@
   1.772            "(Unstable) Various monitor synchronization tunables")            \
   1.773                                                                              \
   1.774    product(intx, EmitSync, 0,                                                \
   1.775 -          "(Unsafe,Unstable) "                                              \
   1.776 -          " Controls emission of inline sync fast-path code")               \
   1.777 +          "(Unsafe, Unstable) "                                             \
   1.778 +          "Control emission of inline sync fast-path code")                 \
   1.779                                                                              \
   1.780    product(intx, MonitorBound, 0, "Bound Monitor population")                \
   1.781                                                                              \
   1.782    product(bool, MonitorInUseLists, false, "Track Monitors for Deflation")   \
   1.783                                                                              \
   1.784 -  product(intx, SyncFlags, 0, "(Unsafe,Unstable) Experimental Sync flags" ) \
   1.785 -                                                                            \
   1.786 -  product(intx, SyncVerbose, 0, "(Unstable)" )                              \
   1.787 -                                                                            \
   1.788 -  product(intx, ClearFPUAtPark, 0, "(Unsafe,Unstable)" )                    \
   1.789 +  product(intx, SyncFlags, 0, "(Unsafe, Unstable) Experimental Sync flags") \
   1.790 +                                                                            \
   1.791 +  product(intx, SyncVerbose, 0, "(Unstable)")                               \
   1.792 +                                                                            \
   1.793 +  product(intx, ClearFPUAtPark, 0, "(Unsafe, Unstable)")                    \
   1.794                                                                              \
   1.795    product(intx, hashCode, 5,                                                \
   1.796 -         "(Unstable) select hashCode generation algorithm" )                \
   1.797 +          "(Unstable) select hashCode generation algorithm")                \
   1.798                                                                              \
   1.799    product(intx, WorkAroundNPTLTimedWaitHang, 1,                             \
   1.800 -         "(Unstable, Linux-specific)"                                       \
   1.801 -         " avoid NPTL-FUTEX hang pthread_cond_timedwait" )                  \
   1.802 +          "(Unstable, Linux-specific) "                                     \
   1.803 +          "avoid NPTL-FUTEX hang pthread_cond_timedwait")                   \
   1.804                                                                              \
   1.805    product(bool, FilterSpuriousWakeups, true,                                \
   1.806            "Prevent spurious or premature wakeups from object.wait "         \
   1.807            "(Solaris only)")                                                 \
   1.808                                                                              \
   1.809 -  product(intx, NativeMonitorTimeout, -1, "(Unstable)" )                    \
   1.810 -  product(intx, NativeMonitorFlags, 0, "(Unstable)" )                       \
   1.811 -  product(intx, NativeMonitorSpinLimit, 20, "(Unstable)" )                  \
   1.812 +  product(intx, NativeMonitorTimeout, -1, "(Unstable)")                     \
   1.813 +                                                                            \
   1.814 +  product(intx, NativeMonitorFlags, 0, "(Unstable)")                        \
   1.815 +                                                                            \
   1.816 +  product(intx, NativeMonitorSpinLimit, 20, "(Unstable)")                   \
   1.817                                                                              \
   1.818    develop(bool, UsePthreads, false,                                         \
   1.819            "Use pthread-based instead of libthread-based synchronization "   \
   1.820            "(SPARC only)")                                                   \
   1.821                                                                              \
   1.822    product(bool, AdjustConcurrency, false,                                   \
   1.823 -          "call thr_setconcurrency at thread create time to avoid "         \
   1.824 -          "LWP starvation on MP systems (For Solaris Only)")                \
   1.825 +          "Call thr_setconcurrency at thread creation time to avoid "       \
   1.826 +          "LWP starvation on MP systems (for Solaris Only)")                \
   1.827                                                                              \
   1.828    product(bool, ReduceSignalUsage, false,                                   \
   1.829            "Reduce the use of OS signals in Java and/or the VM")             \
   1.830 @@ -1120,13 +1170,14 @@
   1.831            "Share vtable stubs (smaller code but worse branch prediction")   \
   1.832                                                                              \
   1.833    develop(bool, LoadLineNumberTables, true,                                 \
   1.834 -          "Tells whether the class file parser loads line number tables")   \
   1.835 +          "Tell whether the class file parser loads line number tables")    \
   1.836                                                                              \
   1.837    develop(bool, LoadLocalVariableTables, true,                              \
   1.838 -          "Tells whether the class file parser loads local variable tables")\
   1.839 +          "Tell whether the class file parser loads local variable tables") \
   1.840                                                                              \
   1.841    develop(bool, LoadLocalVariableTypeTables, true,                          \
   1.842 -          "Tells whether the class file parser loads local variable type tables")\
   1.843 +          "Tell whether the class file parser loads local variable type"    \
   1.844 +          "tables")                                                         \
   1.845                                                                              \
   1.846    product(bool, AllowUserSignalHandlers, false,                             \
   1.847            "Do not complain if the application installs signal handlers "    \
   1.848 @@ -1157,10 +1208,12 @@
   1.849                                                                              \
   1.850    product(bool, EagerXrunInit, false,                                       \
   1.851            "Eagerly initialize -Xrun libraries; allows startup profiling, "  \
   1.852 -          " but not all -Xrun libraries may support the state of the VM at this time") \
   1.853 +          "but not all -Xrun libraries may support the state of the VM "    \
   1.854 +          "at this time")                                                   \
   1.855                                                                              \
   1.856    product(bool, PreserveAllAnnotations, false,                              \
   1.857 -          "Preserve RuntimeInvisibleAnnotations as well as RuntimeVisibleAnnotations") \
   1.858 +          "Preserve RuntimeInvisibleAnnotations as well "                   \
   1.859 +          "as RuntimeVisibleAnnotations")                                   \
   1.860                                                                              \
   1.861    develop(uintx, PreallocatedOutOfMemoryErrorCount, 4,                      \
   1.862            "Number of OutOfMemoryErrors preallocated with backtrace")        \
   1.863 @@ -1235,7 +1288,7 @@
   1.864            "Trace level for JVMTI RedefineClasses")                          \
   1.865                                                                              \
   1.866    develop(bool, StressMethodComparator, false,                              \
   1.867 -          "run the MethodComparator on all loaded methods")                 \
   1.868 +          "Run the MethodComparator on all loaded methods")                 \
   1.869                                                                              \
   1.870    /* change to false by default sometime after Mustang */                   \
   1.871    product(bool, VerifyMergedCPBytecodes, true,                              \
   1.872 @@ -1269,7 +1322,7 @@
   1.873            "Trace dependencies")                                             \
   1.874                                                                              \
   1.875    develop(bool, VerifyDependencies, trueInDebug,                            \
   1.876 -         "Exercise and verify the compilation dependency mechanism")        \
   1.877 +          "Exercise and verify the compilation dependency mechanism")       \
   1.878                                                                              \
   1.879    develop(bool, TraceNewOopMapGeneration, false,                            \
   1.880            "Trace OopMapGeneration")                                         \
   1.881 @@ -1287,7 +1340,7 @@
   1.882            "Trace monitor matching failures during OopMapGeneration")        \
   1.883                                                                              \
   1.884    develop(bool, TraceOopMapRewrites, false,                                 \
   1.885 -          "Trace rewritting of method oops during oop map generation")      \
   1.886 +          "Trace rewriting of method oops during oop map generation")       \
   1.887                                                                              \
   1.888    develop(bool, TraceSafepoint, false,                                      \
   1.889            "Trace safepoint operations")                                     \
   1.890 @@ -1305,10 +1358,10 @@
   1.891            "Trace setup time")                                               \
   1.892                                                                              \
   1.893    develop(bool, TraceProtectionDomainVerification, false,                   \
   1.894 -          "Trace protection domain verifcation")                            \
   1.895 +          "Trace protection domain verification")                           \
   1.896                                                                              \
   1.897    develop(bool, TraceClearedExceptions, false,                              \
   1.898 -          "Prints when an exception is forcibly cleared")                   \
   1.899 +          "Print when an exception is forcibly cleared")                    \
   1.900                                                                              \
   1.901    product(bool, TraceClassResolution, false,                                \
   1.902            "Trace all constant pool resolutions (for debugging)")            \
   1.903 @@ -1322,7 +1375,7 @@
   1.904    /* gc */                                                                  \
   1.905                                                                              \
   1.906    product(bool, UseSerialGC, false,                                         \
   1.907 -          "Use the serial garbage collector")                               \
   1.908 +          "Use the Serial garbage collector")                               \
   1.909                                                                              \
   1.910    product(bool, UseG1GC, false,                                             \
   1.911            "Use the Garbage-First garbage collector")                        \
   1.912 @@ -1341,16 +1394,16 @@
   1.913            "The collection count for the first maximum compaction")          \
   1.914                                                                              \
   1.915    product(bool, UseMaximumCompactionOnSystemGC, true,                       \
   1.916 -          "In the Parallel Old garbage collector maximum compaction for "   \
   1.917 -          "a system GC")                                                    \
   1.918 +          "Use maximum compaction in the Parallel Old garbage collector "   \
   1.919 +          "for a system GC")                                                \
   1.920                                                                              \
   1.921    product(uintx, ParallelOldDeadWoodLimiterMean, 50,                        \
   1.922 -          "The mean used by the par compact dead wood"                      \
   1.923 -          "limiter (a number between 0-100).")                              \
   1.924 +          "The mean used by the parallel compact dead wood "                \
   1.925 +          "limiter (a number between 0-100)")                               \
   1.926                                                                              \
   1.927    product(uintx, ParallelOldDeadWoodLimiterStdDev, 80,                      \
   1.928 -          "The standard deviation used by the par compact dead wood"        \
   1.929 -          "limiter (a number between 0-100).")                              \
   1.930 +          "The standard deviation used by the parallel compact dead wood "  \
   1.931 +          "limiter (a number between 0-100)")                               \
   1.932                                                                              \
   1.933    product(uintx, ParallelGCThreads, 0,                                      \
   1.934            "Number of parallel threads parallel gc will use")                \
   1.935 @@ -1360,7 +1413,7 @@
   1.936            "parallel gc will use")                                           \
   1.937                                                                              \
   1.938    diagnostic(bool, ForceDynamicNumberOfGCThreads, false,                    \
   1.939 -          "Force dynamic selection of the number of"                        \
   1.940 +          "Force dynamic selection of the number of "                       \
   1.941            "parallel threads parallel gc will use to aid debugging")         \
   1.942                                                                              \
   1.943    product(uintx, HeapSizePerGCThread, ScaleForWordSize(64*M),               \
   1.944 @@ -1371,7 +1424,7 @@
   1.945            "Trace the dynamic GC thread usage")                              \
   1.946                                                                              \
   1.947    develop(bool, ParallelOldGCSplitALot, false,                              \
   1.948 -          "Provoke splitting (copying data from a young gen space to"       \
   1.949 +          "Provoke splitting (copying data from a young gen space to "      \
   1.950            "multiple destination spaces)")                                   \
   1.951                                                                              \
   1.952    develop(uintx, ParallelOldGCSplitInterval, 3,                             \
   1.953 @@ -1381,19 +1434,19 @@
   1.954            "Number of threads concurrent gc will use")                       \
   1.955                                                                              \
   1.956    product(uintx, YoungPLABSize, 4096,                                       \
   1.957 -          "Size of young gen promotion labs (in HeapWords)")                \
   1.958 +          "Size of young gen promotion LAB's (in HeapWords)")               \
   1.959                                                                              \
   1.960    product(uintx, OldPLABSize, 1024,                                         \
   1.961 -          "Size of old gen promotion labs (in HeapWords)")                  \
   1.962 +          "Size of old gen promotion LAB's (in HeapWords)")                 \
   1.963                                                                              \
   1.964    product(uintx, GCTaskTimeStampEntries, 200,                               \
   1.965            "Number of time stamp entries per gc worker thread")              \
   1.966                                                                              \
   1.967    product(bool, AlwaysTenure, false,                                        \
   1.968 -          "Always tenure objects in eden. (ParallelGC only)")               \
   1.969 +          "Always tenure objects in eden (ParallelGC only)")                \
   1.970                                                                              \
   1.971    product(bool, NeverTenure, false,                                         \
   1.972 -          "Never tenure objects in eden, May tenure on overflow "           \
   1.973 +          "Never tenure objects in eden, may tenure on overflow "           \
   1.974            "(ParallelGC only)")                                              \
   1.975                                                                              \
   1.976    product(bool, ScavengeBeforeFullGC, true,                                 \
   1.977 @@ -1401,14 +1454,14 @@
   1.978            "used with UseParallelGC")                                        \
   1.979                                                                              \
   1.980    develop(bool, ScavengeWithObjectsInToSpace, false,                        \
   1.981 -          "Allow scavenges to occur when to_space contains objects.")       \
   1.982 +          "Allow scavenges to occur when to-space contains objects")        \
   1.983                                                                              \
   1.984    product(bool, UseConcMarkSweepGC, false,                                  \
   1.985            "Use Concurrent Mark-Sweep GC in the old generation")             \
   1.986                                                                              \
   1.987    product(bool, ExplicitGCInvokesConcurrent, false,                         \
   1.988 -          "A System.gc() request invokes a concurrent collection;"          \
   1.989 -          " (effective only when UseConcMarkSweepGC)")                      \
   1.990 +          "A System.gc() request invokes a concurrent collection; "         \
   1.991 +          "(effective only when UseConcMarkSweepGC)")                       \
   1.992                                                                              \
   1.993    product(bool, ExplicitGCInvokesConcurrentAndUnloadsClasses, false,        \
   1.994            "A System.gc() request invokes a concurrent collection and "      \
   1.995 @@ -1416,19 +1469,19 @@
   1.996            "(effective only when UseConcMarkSweepGC)")                       \
   1.997                                                                              \
   1.998    product(bool, GCLockerInvokesConcurrent, false,                           \
   1.999 -          "The exit of a JNI CS necessitating a scavenge also"              \
  1.1000 -          " kicks off a bkgrd concurrent collection")                       \
  1.1001 +          "The exit of a JNI critical section necessitating a scavenge, "   \
  1.1002 +          "also kicks off a background concurrent collection")              \
  1.1003                                                                              \
  1.1004    product(uintx, GCLockerEdenExpansionPercent, 5,                           \
  1.1005 -          "How much the GC can expand the eden by while the GC locker  "    \
  1.1006 +          "How much the GC can expand the eden by while the GC locker "     \
  1.1007            "is active (as a percentage)")                                    \
  1.1008                                                                              \
  1.1009    diagnostic(intx, GCLockerRetryAllocationCount, 2,                         \
  1.1010 -          "Number of times to retry allocations when"                       \
  1.1011 -          " blocked by the GC locker")                                      \
  1.1012 +          "Number of times to retry allocations when "                      \
  1.1013 +          "blocked by the GC locker")                                       \
  1.1014                                                                              \
  1.1015    develop(bool, UseCMSAdaptiveFreeLists, true,                              \
  1.1016 -          "Use Adaptive Free Lists in the CMS generation")                  \
  1.1017 +          "Use adaptive free lists in the CMS generation")                  \
  1.1018                                                                              \
  1.1019    develop(bool, UseAsyncConcMarkSweepGC, true,                              \
  1.1020            "Use Asynchronous Concurrent Mark-Sweep GC in the old generation")\
  1.1021 @@ -1443,44 +1496,46 @@
  1.1022            "Use passing of collection from background to foreground")        \
  1.1023                                                                              \
  1.1024    product(bool, UseParNewGC, false,                                         \
  1.1025 -          "Use parallel threads in the new generation.")                    \
  1.1026 +          "Use parallel threads in the new generation")                     \
  1.1027                                                                              \
  1.1028    product(bool, ParallelGCVerbose, false,                                   \
  1.1029 -          "Verbose output for parallel GC.")                                \
  1.1030 +          "Verbose output for parallel gc")                                 \
  1.1031                                                                              \
  1.1032    product(uintx, ParallelGCBufferWastePct, 10,                              \
  1.1033 -          "Wasted fraction of parallel allocation buffer.")                 \
  1.1034 +          "Wasted fraction of parallel allocation buffer")                  \
  1.1035                                                                              \
  1.1036    diagnostic(bool, ParallelGCRetainPLAB, false,                             \
  1.1037 -             "Retain parallel allocation buffers across scavenges; "        \
  1.1038 -             " -- disabled because this currently conflicts with "          \
  1.1039 -             " parallel card scanning under certain conditions ")           \
  1.1040 +          "Retain parallel allocation buffers across scavenges; "           \
  1.1041 +          "it is disabled because this currently conflicts with "           \
  1.1042 +          "parallel card scanning under certain conditions.")               \
  1.1043                                                                              \
  1.1044    product(uintx, TargetPLABWastePct, 10,                                    \
  1.1045            "Target wasted space in last buffer as percent of overall "       \
  1.1046            "allocation")                                                     \
  1.1047                                                                              \
  1.1048    product(uintx, PLABWeight, 75,                                            \
  1.1049 -          "Percentage (0-100) used to weight the current sample when"       \
  1.1050 -          "computing exponentially decaying average for ResizePLAB.")       \
  1.1051 +          "Percentage (0-100) used to weigh the current sample when "       \
  1.1052 +          "computing exponentially decaying average for ResizePLAB")        \
  1.1053                                                                              \
  1.1054    product(bool, ResizePLAB, true,                                           \
  1.1055 -          "Dynamically resize (survivor space) promotion labs")             \
  1.1056 +          "Dynamically resize (survivor space) promotion LAB's")            \
  1.1057                                                                              \
  1.1058    product(bool, PrintPLAB, false,                                           \
  1.1059 -          "Print (survivor space) promotion labs sizing decisions")         \
  1.1060 +          "Print (survivor space) promotion LAB's sizing decisions")        \
  1.1061                                                                              \
  1.1062    product(intx, ParGCArrayScanChunk, 50,                                    \
  1.1063 -          "Scan a subset and push remainder, if array is bigger than this") \
  1.1064 +          "Scan a subset of object array and push remainder, if array is "  \
  1.1065 +          "bigger than this")                                               \
  1.1066                                                                              \
  1.1067    product(bool, ParGCUseLocalOverflow, false,                               \
  1.1068            "Instead of a global overflow list, use local overflow stacks")   \
  1.1069                                                                              \
  1.1070    product(bool, ParGCTrimOverflow, true,                                    \
  1.1071 -          "Eagerly trim the local overflow lists (when ParGCUseLocalOverflow") \
  1.1072 +          "Eagerly trim the local overflow lists "                          \
  1.1073 +          "(when ParGCUseLocalOverflow)")                                   \
  1.1074                                                                              \
  1.1075    notproduct(bool, ParGCWorkQueueOverflowALot, false,                       \
  1.1076 -          "Whether we should simulate work queue overflow in ParNew")       \
  1.1077 +          "Simulate work queue overflow in ParNew")                         \
  1.1078                                                                              \
  1.1079    notproduct(uintx, ParGCWorkQueueOverflowInterval, 1000,                   \
  1.1080            "An `interval' counter that determines how frequently "           \
  1.1081 @@ -1498,43 +1553,46 @@
  1.1082            "during card table scanning")                                     \
  1.1083                                                                              \
  1.1084    product(uintx, CMSParPromoteBlocksToClaim, 16,                            \
  1.1085 -          "Number of blocks to attempt to claim when refilling CMS LAB for "\
  1.1086 -          "parallel GC.")                                                   \
  1.1087 +          "Number of blocks to attempt to claim when refilling CMS LAB's "  \
  1.1088 +          "for parallel GC")                                                \
  1.1089                                                                              \
  1.1090    product(uintx, OldPLABWeight, 50,                                         \
  1.1091 -          "Percentage (0-100) used to weight the current sample when"       \
  1.1092 -          "computing exponentially decaying average for resizing CMSParPromoteBlocksToClaim.") \
  1.1093 +          "Percentage (0-100) used to weight the current sample when "      \
  1.1094 +          "computing exponentially decaying average for resizing "          \
  1.1095 +          "CMSParPromoteBlocksToClaim")                                     \
  1.1096                                                                              \
  1.1097    product(bool, ResizeOldPLAB, true,                                        \
  1.1098 -          "Dynamically resize (old gen) promotion labs")                    \
  1.1099 +          "Dynamically resize (old gen) promotion LAB's")                   \
  1.1100                                                                              \
  1.1101    product(bool, PrintOldPLAB, false,                                        \
  1.1102 -          "Print (old gen) promotion labs sizing decisions")                \
  1.1103 +          "Print (old gen) promotion LAB's sizing decisions")               \
  1.1104                                                                              \
  1.1105    product(uintx, CMSOldPLABMin, 16,                                         \
  1.1106 -          "Min size of CMS gen promotion lab caches per worker per blksize")\
  1.1107 +          "Minimum size of CMS gen promotion LAB caches per worker "        \
  1.1108 +          "per block size")                                                 \
  1.1109                                                                              \
  1.1110    product(uintx, CMSOldPLABMax, 1024,                                       \
  1.1111 -          "Max size of CMS gen promotion lab caches per worker per blksize")\
  1.1112 +          "Maximum size of CMS gen promotion LAB caches per worker "        \
  1.1113 +          "per block size")                                                 \
  1.1114                                                                              \
  1.1115    product(uintx, CMSOldPLABNumRefills, 4,                                   \
  1.1116 -          "Nominal number of refills of CMS gen promotion lab cache"        \
  1.1117 -          " per worker per block size")                                     \
  1.1118 +          "Nominal number of refills of CMS gen promotion LAB cache "       \
  1.1119 +          "per worker per block size")                                      \
  1.1120                                                                              \
  1.1121    product(bool, CMSOldPLABResizeQuicker, false,                             \
  1.1122 -          "Whether to react on-the-fly during a scavenge to a sudden"       \
  1.1123 -          " change in block demand rate")                                   \
  1.1124 +          "React on-the-fly during a scavenge to a sudden "                 \
  1.1125 +          "change in block demand rate")                                    \
  1.1126                                                                              \
  1.1127    product(uintx, CMSOldPLABToleranceFactor, 4,                              \
  1.1128 -          "The tolerance of the phase-change detector for on-the-fly"       \
  1.1129 -          " PLAB resizing during a scavenge")                               \
  1.1130 +          "The tolerance of the phase-change detector for on-the-fly "      \
  1.1131 +          "PLAB resizing during a scavenge")                                \
  1.1132                                                                              \
  1.1133    product(uintx, CMSOldPLABReactivityFactor, 2,                             \
  1.1134 -          "The gain in the feedback loop for on-the-fly PLAB resizing"      \
  1.1135 -          " during a scavenge")                                             \
  1.1136 +          "The gain in the feedback loop for on-the-fly PLAB resizing "     \
  1.1137 +          "during a scavenge")                                              \
  1.1138                                                                              \
  1.1139    product(bool, AlwaysPreTouch, false,                                      \
  1.1140 -          "It forces all freshly committed pages to be pre-touched.")       \
  1.1141 +          "Force all freshly committed pages to be pre-touched")            \
  1.1142                                                                              \
  1.1143    product_pd(uintx, CMSYoungGenPerWorker,                                   \
  1.1144            "The maximum size of young gen chosen by default per GC worker "  \
  1.1145 @@ -1544,64 +1602,67 @@
  1.1146            "Whether CMS GC should operate in \"incremental\" mode")          \
  1.1147                                                                              \
  1.1148    product(uintx, CMSIncrementalDutyCycle, 10,                               \
  1.1149 -          "CMS incremental mode duty cycle (a percentage, 0-100).  If"      \
  1.1150 -          "CMSIncrementalPacing is enabled, then this is just the initial"  \
  1.1151 -          "value")                                                          \
  1.1152 +          "Percentage (0-100) of CMS incremental mode duty cycle. If "      \
  1.1153 +          "CMSIncrementalPacing is enabled, then this is just the initial " \
  1.1154 +          "value.")                                                         \
  1.1155                                                                              \
  1.1156    product(bool, CMSIncrementalPacing, true,                                 \
  1.1157            "Whether the CMS incremental mode duty cycle should be "          \
  1.1158            "automatically adjusted")                                         \
  1.1159                                                                              \
  1.1160    product(uintx, CMSIncrementalDutyCycleMin, 0,                             \
  1.1161 -          "Lower bound on the duty cycle when CMSIncrementalPacing is "     \
  1.1162 -          "enabled (a percentage, 0-100)")                                  \
  1.1163 +          "Minimum percentage (0-100) of the CMS incremental duty cycle "   \
  1.1164 +          "used when CMSIncrementalPacing is enabled")                      \
  1.1165                                                                              \
  1.1166    product(uintx, CMSIncrementalSafetyFactor, 10,                            \
  1.1167            "Percentage (0-100) used to add conservatism when computing the " \
  1.1168            "duty cycle")                                                     \
  1.1169                                                                              \
  1.1170    product(uintx, CMSIncrementalOffset, 0,                                   \
  1.1171 -          "Percentage (0-100) by which the CMS incremental mode duty cycle" \
  1.1172 -          " is shifted to the right within the period between young GCs")   \
  1.1173 +          "Percentage (0-100) by which the CMS incremental mode duty cycle "\
  1.1174 +          "is shifted to the right within the period between young GCs")    \
  1.1175                                                                              \
  1.1176    product(uintx, CMSExpAvgFactor, 50,                                       \
  1.1177 -          "Percentage (0-100) used to weight the current sample when"       \
  1.1178 -          "computing exponential averages for CMS statistics.")             \
  1.1179 +          "Percentage (0-100) used to weigh the current sample when "       \
  1.1180 +          "computing exponential averages for CMS statistics")              \
  1.1181                                                                              \
  1.1182    product(uintx, CMS_FLSWeight, 75,                                         \
  1.1183 -          "Percentage (0-100) used to weight the current sample when"       \
  1.1184 -          "computing exponentially decating averages for CMS FLS statistics.") \
  1.1185 +          "Percentage (0-100) used to weigh the current sample when "       \
  1.1186 +          "computing exponentially decaying averages for CMS FLS "          \
  1.1187 +          "statistics")                                                     \
  1.1188                                                                              \
  1.1189    product(uintx, CMS_FLSPadding, 1,                                         \
  1.1190 -          "The multiple of deviation from mean to use for buffering"        \
  1.1191 -          "against volatility in free list demand.")                        \
  1.1192 +          "The multiple of deviation from mean to use for buffering "       \
  1.1193 +          "against volatility in free list demand")                         \
  1.1194                                                                              \
  1.1195    product(uintx, FLSCoalescePolicy, 2,                                      \
  1.1196 -          "CMS: Aggression level for coalescing, increasing from 0 to 4")   \
  1.1197 +          "CMS: aggressiveness level for coalescing, increasing "           \
  1.1198 +          "from 0 to 4")                                                    \
  1.1199                                                                              \
  1.1200    product(bool, FLSAlwaysCoalesceLarge, false,                              \
  1.1201 -          "CMS: Larger free blocks are always available for coalescing")    \
  1.1202 +          "CMS: larger free blocks are always available for coalescing")    \
  1.1203                                                                              \
  1.1204    product(double, FLSLargestBlockCoalesceProximity, 0.99,                   \
  1.1205 -          "CMS: the smaller the percentage the greater the coalition force")\
  1.1206 +          "CMS: the smaller the percentage the greater the coalescing "     \
  1.1207 +          "force")                                                          \
  1.1208                                                                              \
  1.1209    product(double, CMSSmallCoalSurplusPercent, 1.05,                         \
  1.1210 -          "CMS: the factor by which to inflate estimated demand of small"   \
  1.1211 -          " block sizes to prevent coalescing with an adjoining block")     \
  1.1212 +          "CMS: the factor by which to inflate estimated demand of small "  \
  1.1213 +          "block sizes to prevent coalescing with an adjoining block")      \
  1.1214                                                                              \
  1.1215    product(double, CMSLargeCoalSurplusPercent, 0.95,                         \
  1.1216 -          "CMS: the factor by which to inflate estimated demand of large"   \
  1.1217 -          " block sizes to prevent coalescing with an adjoining block")     \
  1.1218 +          "CMS: the factor by which to inflate estimated demand of large "  \
  1.1219 +          "block sizes to prevent coalescing with an adjoining block")      \
  1.1220                                                                              \
  1.1221    product(double, CMSSmallSplitSurplusPercent, 1.10,                        \
  1.1222 -          "CMS: the factor by which to inflate estimated demand of small"   \
  1.1223 -          " block sizes to prevent splitting to supply demand for smaller"  \
  1.1224 -          " blocks")                                                        \
  1.1225 +          "CMS: the factor by which to inflate estimated demand of small "  \
  1.1226 +          "block sizes to prevent splitting to supply demand for smaller "  \
  1.1227 +          "blocks")                                                         \
  1.1228                                                                              \
  1.1229    product(double, CMSLargeSplitSurplusPercent, 1.00,                        \
  1.1230 -          "CMS: the factor by which to inflate estimated demand of large"   \
  1.1231 -          " block sizes to prevent splitting to supply demand for smaller"  \
  1.1232 -          " blocks")                                                        \
  1.1233 +          "CMS: the factor by which to inflate estimated demand of large "  \
  1.1234 +          "block sizes to prevent splitting to supply demand for smaller "  \
  1.1235 +          "blocks")                                                         \
  1.1236                                                                              \
  1.1237    product(bool, CMSExtrapolateSweep, false,                                 \
  1.1238            "CMS: cushion for block demand during sweep")                     \
  1.1239 @@ -1613,11 +1674,11 @@
  1.1240                                                                              \
  1.1241    product(uintx, CMS_SweepPadding, 1,                                       \
  1.1242            "The multiple of deviation from mean to use for buffering "       \
  1.1243 -          "against volatility in inter-sweep duration.")                    \
  1.1244 +          "against volatility in inter-sweep duration")                     \
  1.1245                                                                              \
  1.1246    product(uintx, CMS_SweepTimerThresholdMillis, 10,                         \
  1.1247            "Skip block flux-rate sampling for an epoch unless inter-sweep "  \
  1.1248 -          "duration exceeds this threhold in milliseconds")                 \
  1.1249 +          "duration exceeds this threshold in milliseconds")                \
  1.1250                                                                              \
  1.1251    develop(bool, CMSTraceIncrementalMode, false,                             \
  1.1252            "Trace CMS incremental mode")                                     \
  1.1253 @@ -1632,14 +1693,15 @@
  1.1254            "Whether class unloading enabled when using CMS GC")              \
  1.1255                                                                              \
  1.1256    product(uintx, CMSClassUnloadingMaxInterval, 0,                           \
  1.1257 -          "When CMS class unloading is enabled, the maximum CMS cycle count"\
  1.1258 -          " for which classes may not be unloaded")                         \
  1.1259 +          "When CMS class unloading is enabled, the maximum CMS cycle "     \
  1.1260 +          "count for which classes may not be unloaded")                    \
  1.1261                                                                              \
  1.1262    product(bool, CMSCompactWhenClearAllSoftRefs, true,                       \
  1.1263 -          "Compact when asked to collect CMS gen with clear_all_soft_refs") \
  1.1264 +          "Compact when asked to collect CMS gen with "                     \
  1.1265 +          "clear_all_soft_refs()")                                          \
  1.1266                                                                              \
  1.1267    product(bool, UseCMSCompactAtFullCollection, true,                        \
  1.1268 -          "Use mark sweep compact at full collections")                     \
  1.1269 +          "Use Mark-Sweep-Compact algorithm at full collections")           \
  1.1270                                                                              \
  1.1271    product(uintx, CMSFullGCsBeforeCompaction, 0,                             \
  1.1272            "Number of CMS full collection done before compaction if > 0")    \
  1.1273 @@ -1661,38 +1723,37 @@
  1.1274            "Warn in case of excessive CMS looping")                          \
  1.1275                                                                              \
  1.1276    develop(bool, CMSOverflowEarlyRestoration, false,                         \
  1.1277 -          "Whether preserved marks should be restored early")               \
  1.1278 +          "Restore preserved marks early")                                  \
  1.1279                                                                              \
  1.1280    product(uintx, MarkStackSize, NOT_LP64(32*K) LP64_ONLY(4*M),              \
  1.1281            "Size of marking stack")                                          \
  1.1282                                                                              \
  1.1283    product(uintx, MarkStackSizeMax, NOT_LP64(4*M) LP64_ONLY(512*M),          \
  1.1284 -          "Max size of marking stack")                                      \
  1.1285 +          "Maximum size of marking stack")                                  \
  1.1286                                                                              \
  1.1287    notproduct(bool, CMSMarkStackOverflowALot, false,                         \
  1.1288 -          "Whether we should simulate frequent marking stack / work queue"  \
  1.1289 -          " overflow")                                                      \
  1.1290 +          "Simulate frequent marking stack / work queue overflow")          \
  1.1291                                                                              \
  1.1292    notproduct(uintx, CMSMarkStackOverflowInterval, 1000,                     \
  1.1293 -          "An `interval' counter that determines how frequently"            \
  1.1294 -          " we simulate overflow; a smaller number increases frequency")    \
  1.1295 +          "An \"interval\" counter that determines how frequently "         \
  1.1296 +          "to simulate overflow; a smaller number increases frequency")     \
  1.1297                                                                              \
  1.1298    product(uintx, CMSMaxAbortablePrecleanLoops, 0,                           \
  1.1299 -          "(Temporary, subject to experimentation)"                         \
  1.1300 +          "(Temporary, subject to experimentation) "                        \
  1.1301            "Maximum number of abortable preclean iterations, if > 0")        \
  1.1302                                                                              \
  1.1303    product(intx, CMSMaxAbortablePrecleanTime, 5000,                          \
  1.1304 -          "(Temporary, subject to experimentation)"                         \
  1.1305 -          "Maximum time in abortable preclean in ms")                       \
  1.1306 +          "(Temporary, subject to experimentation) "                        \
  1.1307 +          "Maximum time in abortable preclean (in milliseconds)")           \
  1.1308                                                                              \
  1.1309    product(uintx, CMSAbortablePrecleanMinWorkPerIteration, 100,              \
  1.1310 -          "(Temporary, subject to experimentation)"                         \
  1.1311 +          "(Temporary, subject to experimentation) "                        \
  1.1312            "Nominal minimum work per abortable preclean iteration")          \
  1.1313                                                                              \
  1.1314    manageable(intx, CMSAbortablePrecleanWaitMillis, 100,                     \
  1.1315 -          "(Temporary, subject to experimentation)"                         \
  1.1316 -          " Time that we sleep between iterations when not given"           \
  1.1317 -          " enough work per iteration")                                     \
  1.1318 +          "(Temporary, subject to experimentation) "                        \
  1.1319 +          "Time that we sleep between iterations when not given "           \
  1.1320 +          "enough work per iteration")                                      \
  1.1321                                                                              \
  1.1322    product(uintx, CMSRescanMultiple, 32,                                     \
  1.1323            "Size (in cards) of CMS parallel rescan task")                    \
  1.1324 @@ -1710,23 +1771,24 @@
  1.1325            "Whether parallel remark enabled (only if ParNewGC)")             \
  1.1326                                                                              \
  1.1327    product(bool, CMSParallelSurvivorRemarkEnabled, true,                     \
  1.1328 -          "Whether parallel remark of survivor space"                       \
  1.1329 -          " enabled (effective only if CMSParallelRemarkEnabled)")          \
  1.1330 +          "Whether parallel remark of survivor space "                      \
  1.1331 +          "enabled (effective only if CMSParallelRemarkEnabled)")           \
  1.1332                                                                              \
  1.1333    product(bool, CMSPLABRecordAlways, true,                                  \
  1.1334 -          "Whether to always record survivor space PLAB bdries"             \
  1.1335 -          " (effective only if CMSParallelSurvivorRemarkEnabled)")          \
  1.1336 +          "Always record survivor space PLAB boundaries (effective only "   \
  1.1337 +          "if CMSParallelSurvivorRemarkEnabled)")                           \
  1.1338                                                                              \
  1.1339    product(bool, CMSEdenChunksRecordAlways, true,                            \
  1.1340 -          "Whether to always record eden chunks used for "                  \
  1.1341 -          "the parallel initial mark or remark of eden" )                   \
  1.1342 +          "Always record eden chunks used for the parallel initial mark "   \
  1.1343 +          "or remark of eden")                                              \
  1.1344                                                                              \
  1.1345    product(bool, CMSPrintEdenSurvivorChunks, false,                          \
  1.1346            "Print the eden and the survivor chunks used for the parallel "   \
  1.1347            "initial mark or remark of the eden/survivor spaces")             \
  1.1348                                                                              \
  1.1349    product(bool, CMSConcurrentMTEnabled, true,                               \
  1.1350 -          "Whether multi-threaded concurrent work enabled (if ParNewGC)")   \
  1.1351 +          "Whether multi-threaded concurrent work enabled "                 \
  1.1352 +          "(effective only if ParNewGC)")                                   \
  1.1353                                                                              \
  1.1354    product(bool, CMSPrecleaningEnabled, true,                                \
  1.1355            "Whether concurrent precleaning enabled")                         \
  1.1356 @@ -1735,12 +1797,12 @@
  1.1357            "Maximum number of precleaning iteration passes")                 \
  1.1358                                                                              \
  1.1359    product(uintx, CMSPrecleanNumerator, 2,                                   \
  1.1360 -          "CMSPrecleanNumerator:CMSPrecleanDenominator yields convergence"  \
  1.1361 -          " ratio")                                                         \
  1.1362 +          "CMSPrecleanNumerator:CMSPrecleanDenominator yields convergence " \
  1.1363 +          "ratio")                                                          \
  1.1364                                                                              \
  1.1365    product(uintx, CMSPrecleanDenominator, 3,                                 \
  1.1366 -          "CMSPrecleanNumerator:CMSPrecleanDenominator yields convergence"  \
  1.1367 -          " ratio")                                                         \
  1.1368 +          "CMSPrecleanNumerator:CMSPrecleanDenominator yields convergence " \
  1.1369 +          "ratio")                                                          \
  1.1370                                                                              \
  1.1371    product(bool, CMSPrecleanRefLists1, true,                                 \
  1.1372            "Preclean ref lists during (initial) preclean phase")             \
  1.1373 @@ -1755,7 +1817,7 @@
  1.1374            "Preclean survivors during abortable preclean phase")             \
  1.1375                                                                              \
  1.1376    product(uintx, CMSPrecleanThreshold, 1000,                                \
  1.1377 -          "Don't re-iterate if #dirty cards less than this")                \
  1.1378 +          "Do not iterate again if number of dirty cards is less than this")\
  1.1379                                                                              \
  1.1380    product(bool, CMSCleanOnEnter, true,                                      \
  1.1381            "Clean-on-enter optimization for reducing number of dirty cards") \
  1.1382 @@ -1764,14 +1826,16 @@
  1.1383            "Choose variant (1,2) of verification following remark")          \
  1.1384                                                                              \
  1.1385    product(uintx, CMSScheduleRemarkEdenSizeThreshold, 2*M,                   \
  1.1386 -          "If Eden used is below this value, don't try to schedule remark") \
  1.1387 +          "If Eden size is below this, do not try to schedule remark")      \
  1.1388                                                                              \
  1.1389    product(uintx, CMSScheduleRemarkEdenPenetration, 50,                      \
  1.1390 -          "The Eden occupancy % at which to try and schedule remark pause") \
  1.1391 +          "The Eden occupancy percentage (0-100) at which "                 \
  1.1392 +          "to try and schedule remark pause")                               \
  1.1393                                                                              \
  1.1394    product(uintx, CMSScheduleRemarkSamplingRatio, 5,                         \
  1.1395 -          "Start sampling Eden top at least before yg occupancy reaches"    \
  1.1396 -          " 1/<ratio> of the size at which we plan to schedule remark")     \
  1.1397 +          "Start sampling eden top at least before young gen "              \
  1.1398 +          "occupancy reaches 1/<ratio> of the size at which "               \
  1.1399 +          "we plan to schedule remark")                                     \
  1.1400                                                                              \
  1.1401    product(uintx, CMSSamplingGrain, 16*K,                                    \
  1.1402            "The minimum distance between eden samples for CMS (see above)")  \
  1.1403 @@ -1793,27 +1857,27 @@
  1.1404            "should start a collection cycle")                                \
  1.1405                                                                              \
  1.1406    product(bool, CMSYield, true,                                             \
  1.1407 -          "Yield between steps of concurrent mark & sweep")                 \
  1.1408 +          "Yield between steps of CMS")                                     \
  1.1409                                                                              \
  1.1410    product(uintx, CMSBitMapYieldQuantum, 10*M,                               \
  1.1411 -          "Bitmap operations should process at most this many bits"         \
  1.1412 +          "Bitmap operations should process at most this many bits "        \
  1.1413            "between yields")                                                 \
  1.1414                                                                              \
  1.1415    product(bool, CMSDumpAtPromotionFailure, false,                           \
  1.1416            "Dump useful information about the state of the CMS old "         \
  1.1417 -          " generation upon a promotion failure.")                          \
  1.1418 +          "generation upon a promotion failure")                            \
  1.1419                                                                              \
  1.1420    product(bool, CMSPrintChunksInDump, false,                                \
  1.1421            "In a dump enabled by CMSDumpAtPromotionFailure, include "        \
  1.1422 -          " more detailed information about the free chunks.")              \
  1.1423 +          "more detailed information about the free chunks")                \
  1.1424                                                                              \
  1.1425    product(bool, CMSPrintObjectsInDump, false,                               \
  1.1426            "In a dump enabled by CMSDumpAtPromotionFailure, include "        \
  1.1427 -          " more detailed information about the allocated objects.")        \
  1.1428 +          "more detailed information about the allocated objects")          \
  1.1429                                                                              \
  1.1430    diagnostic(bool, FLSVerifyAllHeapReferences, false,                       \
  1.1431 -          "Verify that all refs across the FLS boundary "                   \
  1.1432 -          " are to valid objects")                                          \
  1.1433 +          "Verify that all references across the FLS boundary "             \
  1.1434 +          "are to valid objects")                                           \
  1.1435                                                                              \
  1.1436    diagnostic(bool, FLSVerifyLists, false,                                   \
  1.1437            "Do lots of (expensive) FreeListSpace verification")              \
  1.1438 @@ -1825,17 +1889,18 @@
  1.1439            "Do lots of (expensive) FLS dictionary verification")             \
  1.1440                                                                              \
  1.1441    develop(bool, VerifyBlockOffsetArray, false,                              \
  1.1442 -          "Do (expensive!) block offset array verification")                \
  1.1443 +          "Do (expensive) block offset array verification")                 \
  1.1444                                                                              \
  1.1445    diagnostic(bool, BlockOffsetArrayUseUnallocatedBlock, false,              \
  1.1446 -          "Maintain _unallocated_block in BlockOffsetArray"                 \
  1.1447 -          " (currently applicable only to CMS collector)")                  \
  1.1448 +          "Maintain _unallocated_block in BlockOffsetArray "                \
  1.1449 +          "(currently applicable only to CMS collector)")                   \
  1.1450                                                                              \
  1.1451    develop(bool, TraceCMSState, false,                                       \
  1.1452            "Trace the state of the CMS collection")                          \
  1.1453                                                                              \
  1.1454    product(intx, RefDiscoveryPolicy, 0,                                      \
  1.1455 -          "Whether reference-based(0) or referent-based(1)")                \
  1.1456 +          "Select type of reference discovery policy: "                     \
  1.1457 +          "reference-based(0) or referent-based(1)")                        \
  1.1458                                                                              \
  1.1459    product(bool, ParallelRefProcEnabled, false,                              \
  1.1460            "Enable parallel reference processing whenever possible")         \
  1.1461 @@ -1863,7 +1928,7 @@
  1.1462            "denotes 'do constant GC cycles'.")                               \
  1.1463                                                                              \
  1.1464    product(bool, UseCMSInitiatingOccupancyOnly, false,                       \
  1.1465 -          "Only use occupancy as a crierion for starting a CMS collection") \
  1.1466 +          "Only use occupancy as a criterion for starting a CMS collection")\
  1.1467                                                                              \
  1.1468    product(uintx, CMSIsTooFullPercentage, 98,                                \
  1.1469            "An absolute ceiling above which CMS will always consider the "   \
  1.1470 @@ -1875,7 +1940,7 @@
  1.1471                                                                              \
  1.1472    notproduct(bool, CMSVerifyReturnedBytes, false,                           \
  1.1473            "Check that all the garbage collected was returned to the "       \
  1.1474 -          "free lists.")                                                    \
  1.1475 +          "free lists")                                                     \
  1.1476                                                                              \
  1.1477    notproduct(bool, ScavengeALot, false,                                     \
  1.1478            "Force scavenge at every Nth exit from the runtime system "       \
  1.1479 @@ -1890,16 +1955,16 @@
  1.1480                                                                              \
  1.1481    product(bool, PrintPromotionFailure, false,                               \
  1.1482            "Print additional diagnostic information following "              \
  1.1483 -          " promotion failure")                                             \
  1.1484 +          "promotion failure")                                              \
  1.1485                                                                              \
  1.1486    notproduct(bool, PromotionFailureALot, false,                             \
  1.1487            "Use promotion failure handling on every youngest generation "    \
  1.1488            "collection")                                                     \
  1.1489                                                                              \
  1.1490    develop(uintx, PromotionFailureALotCount, 1000,                           \
  1.1491 -          "Number of promotion failures occurring at ParGCAllocBuffer"      \
  1.1492 +          "Number of promotion failures occurring at ParGCAllocBuffer "     \
  1.1493            "refill attempts (ParNew) or promotion attempts "                 \
  1.1494 -          "(other young collectors) ")                                      \
  1.1495 +          "(other young collectors)")                                       \
  1.1496                                                                              \
  1.1497    develop(uintx, PromotionFailureALotInterval, 5,                           \
  1.1498            "Total collections between promotion failures alot")              \
  1.1499 @@ -1918,7 +1983,7 @@
  1.1500            "Ratio of hard spins to calls to yield")                          \
  1.1501                                                                              \
  1.1502    develop(uintx, ObjArrayMarkingStride, 512,                                \
  1.1503 -          "Number of ObjArray elements to push onto the marking stack"      \
  1.1504 +          "Number of object array elements to push onto the marking stack " \
  1.1505            "before pushing a continuation entry")                            \
  1.1506                                                                              \
  1.1507    develop(bool, MetadataAllocationFailALot, false,                          \
  1.1508 @@ -1926,14 +1991,7 @@
  1.1509            "MetadataAllocationFailALotInterval")                             \
  1.1510                                                                              \
  1.1511    develop(uintx, MetadataAllocationFailALotInterval, 1000,                  \
  1.1512 -          "metadata allocation failure alot interval")                      \
  1.1513 -                                                                            \
  1.1514 -  develop(bool, MetaDataDeallocateALot, false,                              \
  1.1515 -          "Deallocation bunches of metadata at intervals controlled by "    \
  1.1516 -          "MetaDataAllocateALotInterval")                                   \
  1.1517 -                                                                            \
  1.1518 -  develop(uintx, MetaDataDeallocateALotInterval, 100,                       \
  1.1519 -          "Metadata deallocation alot interval")                            \
  1.1520 +          "Metadata allocation failure a lot interval")                     \
  1.1521                                                                              \
  1.1522    develop(bool, TraceMetadataChunkAllocation, false,                        \
  1.1523            "Trace chunk metadata allocations")                               \
  1.1524 @@ -1945,7 +2003,7 @@
  1.1525            "Trace virtual space metadata allocations")                       \
  1.1526                                                                              \
  1.1527    notproduct(bool, ExecuteInternalVMTests, false,                           \
  1.1528 -          "Enable execution of internal VM tests.")                         \
  1.1529 +          "Enable execution of internal VM tests")                          \
  1.1530                                                                              \
  1.1531    notproduct(bool, VerboseInternalVMTests, false,                           \
  1.1532            "Turn on logging for internal VM tests.")                         \
  1.1533 @@ -1953,7 +2011,7 @@
  1.1534    product_pd(bool, UseTLAB, "Use thread-local object allocation")           \
  1.1535                                                                              \
  1.1536    product_pd(bool, ResizeTLAB,                                              \
  1.1537 -          "Dynamically resize tlab size for threads")                       \
  1.1538 +          "Dynamically resize TLAB size for threads")                       \
  1.1539                                                                              \
  1.1540    product(bool, ZeroTLAB, false,                                            \
  1.1541            "Zero out the newly created TLAB")                                \
  1.1542 @@ -1965,7 +2023,8 @@
  1.1543            "Print various TLAB related information")                         \
  1.1544                                                                              \
  1.1545    product(bool, TLABStats, true,                                            \
  1.1546 -          "Print various TLAB related information")                         \
  1.1547 +          "Provide more detailed and expensive TLAB statistics "            \
  1.1548 +          "(with PrintTLAB)")                                               \
  1.1549                                                                              \
  1.1550    EMBEDDED_ONLY(product(bool, LowMemoryProtection, true,                    \
  1.1551            "Enable LowMemoryProtection"))                                    \
  1.1552 @@ -1999,14 +2058,14 @@
  1.1553            "Fraction (1/n) of real memory used for initial heap size")       \
  1.1554                                                                              \
  1.1555    develop(uintx, MaxVirtMemFraction, 2,                                     \
  1.1556 -          "Maximum fraction (1/n) of virtual memory used for ergonomically" \
  1.1557 +          "Maximum fraction (1/n) of virtual memory used for ergonomically "\
  1.1558            "determining maximum heap size")                                  \
  1.1559                                                                              \
  1.1560    product(bool, UseAutoGCSelectPolicy, false,                               \
  1.1561            "Use automatic collection selection policy")                      \
  1.1562                                                                              \
  1.1563    product(uintx, AutoGCSelectPauseMillis, 5000,                             \
  1.1564 -          "Automatic GC selection pause threshhold in ms")                  \
  1.1565 +          "Automatic GC selection pause threshold in milliseconds")         \
  1.1566                                                                              \
  1.1567    product(bool, UseAdaptiveSizePolicy, true,                                \
  1.1568            "Use adaptive generation sizing policies")                        \
  1.1569 @@ -2021,7 +2080,7 @@
  1.1570            "Use adaptive young-old sizing policies at major collections")    \
  1.1571                                                                              \
  1.1572    product(bool, UseAdaptiveSizePolicyWithSystemGC, false,                   \
  1.1573 -          "Use statistics from System.GC for adaptive size policy")         \
  1.1574 +          "Include statistics from System.gc() for adaptive size policy")   \
  1.1575                                                                              \
  1.1576    product(bool, UseAdaptiveGCBoundary, false,                               \
  1.1577            "Allow young-old boundary to move")                               \
  1.1578 @@ -2033,16 +2092,16 @@
  1.1579            "Resize the virtual spaces of the young or old generations")      \
  1.1580                                                                              \
  1.1581    product(uintx, AdaptiveSizeThroughPutPolicy, 0,                           \
  1.1582 -          "Policy for changeing generation size for throughput goals")      \
  1.1583 +          "Policy for changing generation size for throughput goals")       \
  1.1584                                                                              \
  1.1585    product(uintx, AdaptiveSizePausePolicy, 0,                                \
  1.1586            "Policy for changing generation size for pause goals")            \
  1.1587                                                                              \
  1.1588    develop(bool, PSAdjustTenuredGenForMinorPause, false,                     \
  1.1589 -          "Adjust tenured generation to achive a minor pause goal")         \
  1.1590 +          "Adjust tenured generation to achieve a minor pause goal")        \
  1.1591                                                                              \
  1.1592    develop(bool, PSAdjustYoungGenForMajorPause, false,                       \
  1.1593 -          "Adjust young generation to achive a major pause goal")           \
  1.1594 +          "Adjust young generation to achieve a major pause goal")          \
  1.1595                                                                              \
  1.1596    product(uintx, AdaptiveSizePolicyInitializingSteps, 20,                   \
  1.1597            "Number of steps where heuristics is used before data is used")   \
  1.1598 @@ -2097,14 +2156,15 @@
  1.1599            "Decay factor to TenuredGenerationSizeIncrement")                 \
  1.1600                                                                              \
  1.1601    product(uintx, MaxGCPauseMillis, max_uintx,                               \
  1.1602 -          "Adaptive size policy maximum GC pause time goal in msec, "       \
  1.1603 -          "or (G1 Only) the max. GC time per MMU time slice")               \
  1.1604 +          "Adaptive size policy maximum GC pause time goal in millisecond, "\
  1.1605 +          "or (G1 Only) the maximum GC time per MMU time slice")            \
  1.1606                                                                              \
  1.1607    product(uintx, GCPauseIntervalMillis, 0,                                  \
  1.1608            "Time slice for MMU specification")                               \
  1.1609                                                                              \
  1.1610    product(uintx, MaxGCMinorPauseMillis, max_uintx,                          \
  1.1611 -          "Adaptive size policy maximum GC minor pause time goal in msec")  \
  1.1612 +          "Adaptive size policy maximum GC minor pause time goal "          \
  1.1613 +          "in millisecond")                                                 \
  1.1614                                                                              \
  1.1615    product(uintx, GCTimeRatio, 99,                                           \
  1.1616            "Adaptive size policy application time to GC time ratio")         \
  1.1617 @@ -2122,7 +2182,7 @@
  1.1618            "Minimum ratio of young generation/survivor space size")          \
  1.1619                                                                              \
  1.1620    product(uintx, InitialSurvivorRatio, 8,                                   \
  1.1621 -          "Initial ratio of eden/survivor space size")                      \
  1.1622 +          "Initial ratio of young generation/survivor space size")          \
  1.1623                                                                              \
  1.1624    product(uintx, BaseFootPrintEstimate, 256*M,                              \
  1.1625            "Estimate of footprint other than Java Heap")                     \
  1.1626 @@ -2132,8 +2192,8 @@
  1.1627            "before an OutOfMemory error is thrown")                          \
  1.1628                                                                              \
  1.1629    product(uintx, GCTimeLimit, 98,                                           \
  1.1630 -          "Limit of proportion of time spent in GC before an OutOfMemory"   \
  1.1631 -          "error is thrown (used with GCHeapFreeLimit)")                    \
  1.1632 +          "Limit of the proportion of time spent in GC before "             \
  1.1633 +          "an OutOfMemoryError is thrown (used with GCHeapFreeLimit)")      \
  1.1634                                                                              \
  1.1635    product(uintx, GCHeapFreeLimit, 2,                                        \
  1.1636            "Minimum percentage of free space after a full GC before an "     \
  1.1637 @@ -2155,7 +2215,7 @@
  1.1638            "How many fields ahead to prefetch in oop scan (<= 0 means off)") \
  1.1639                                                                              \
  1.1640    diagnostic(bool, VerifySilently, false,                                   \
  1.1641 -          "Don't print print the verification progress")                    \
  1.1642 +          "Do not print the verification progress")                         \
  1.1643                                                                              \
  1.1644    diagnostic(bool, VerifyDuringStartup, false,                              \
  1.1645            "Verify memory system before executing any Java code "            \
  1.1646 @@ -2178,7 +2238,7 @@
  1.1647                                                                              \
  1.1648    diagnostic(bool, DeferInitialCardMark, false,                             \
  1.1649            "When +ReduceInitialCardMarks, explicitly defer any that "        \
  1.1650 -           "may arise from new_pre_store_barrier")                          \
  1.1651 +          "may arise from new_pre_store_barrier")                           \
  1.1652                                                                              \
  1.1653    diagnostic(bool, VerifyRememberedSets, false,                             \
  1.1654            "Verify GC remembered sets")                                      \
  1.1655 @@ -2187,10 +2247,10 @@
  1.1656            "Verify GC object start array if verify before/after")            \
  1.1657                                                                              \
  1.1658    product(bool, DisableExplicitGC, false,                                   \
  1.1659 -          "Tells whether calling System.gc() does a full GC")               \
  1.1660 +          "Ignore calls to System.gc()")                                    \
  1.1661                                                                              \
  1.1662    notproduct(bool, CheckMemoryInitialization, false,                        \
  1.1663 -          "Checks memory initialization")                                   \
  1.1664 +          "Check memory initialization")                                    \
  1.1665                                                                              \
  1.1666    product(bool, CollectGen0First, false,                                    \
  1.1667            "Collect youngest generation before each full GC")                \
  1.1668 @@ -2211,44 +2271,45 @@
  1.1669            "Stride through processors when distributing processes")          \
  1.1670                                                                              \
  1.1671    product(uintx, CMSCoordinatorYieldSleepCount, 10,                         \
  1.1672 -          "number of times the coordinator GC thread will sleep while "     \
  1.1673 +          "Number of times the coordinator GC thread will sleep while "     \
  1.1674            "yielding before giving up and resuming GC")                      \
  1.1675                                                                              \
  1.1676    product(uintx, CMSYieldSleepCount, 0,                                     \
  1.1677 -          "number of times a GC thread (minus the coordinator) "            \
  1.1678 +          "Number of times a GC thread (minus the coordinator) "            \
  1.1679            "will sleep while yielding before giving up and resuming GC")     \
  1.1680                                                                              \
  1.1681    /* gc tracing */                                                          \
  1.1682    manageable(bool, PrintGC, false,                                          \
  1.1683 -          "Print message at garbage collect")                               \
  1.1684 +          "Print message at garbage collection")                            \
  1.1685                                                                              \
  1.1686    manageable(bool, PrintGCDetails, false,                                   \
  1.1687 -          "Print more details at garbage collect")                          \
  1.1688 +          "Print more details at garbage collection")                       \
  1.1689                                                                              \
  1.1690    manageable(bool, PrintGCDateStamps, false,                                \
  1.1691 -          "Print date stamps at garbage collect")                           \
  1.1692 +          "Print date stamps at garbage collection")                        \
  1.1693                                                                              \
  1.1694    manageable(bool, PrintGCTimeStamps, false,                                \
  1.1695 -          "Print timestamps at garbage collect")                            \
  1.1696 +          "Print timestamps at garbage collection")                         \
  1.1697                                                                              \
  1.1698    product(bool, PrintGCTaskTimeStamps, false,                               \
  1.1699            "Print timestamps for individual gc worker thread tasks")         \
  1.1700                                                                              \
  1.1701    develop(intx, ConcGCYieldTimeout, 0,                                      \
  1.1702 -          "If non-zero, assert that GC threads yield within this # of ms.") \
  1.1703 +          "If non-zero, assert that GC threads yield within this "          \
  1.1704 +          "number of milliseconds")                                         \
  1.1705                                                                              \
  1.1706    notproduct(bool, TraceMarkSweep, false,                                   \
  1.1707            "Trace mark sweep")                                               \
  1.1708                                                                              \
  1.1709    product(bool, PrintReferenceGC, false,                                    \
  1.1710            "Print times spent handling reference objects during GC "         \
  1.1711 -          " (enabled only when PrintGCDetails)")                            \
  1.1712 +          "(enabled only when PrintGCDetails)")                             \
  1.1713                                                                              \
  1.1714    develop(bool, TraceReferenceGC, false,                                    \
  1.1715            "Trace handling of soft/weak/final/phantom references")           \
  1.1716                                                                              \
  1.1717    develop(bool, TraceFinalizerRegistration, false,                          \
  1.1718 -         "Trace registration of final references")                          \
  1.1719 +          "Trace registration of final references")                         \
  1.1720                                                                              \
  1.1721    notproduct(bool, TraceScavenge, false,                                    \
  1.1722            "Trace scavenge")                                                 \
  1.1723 @@ -2285,7 +2346,7 @@
  1.1724            "Print heap layout before and after each GC")                     \
  1.1725                                                                              \
  1.1726    product_rw(bool, PrintHeapAtGCExtended, false,                            \
  1.1727 -          "Prints extended information about the layout of the heap "       \
  1.1728 +          "Print extended information about the layout of the heap "        \
  1.1729            "when -XX:+PrintHeapAtGC is set")                                 \
  1.1730                                                                              \
  1.1731    product(bool, PrintHeapAtSIGBREAK, true,                                  \
  1.1732 @@ -2322,45 +2383,45 @@
  1.1733            "Trace actions of the GC task threads")                           \
  1.1734                                                                              \
  1.1735    product(bool, PrintParallelOldGCPhaseTimes, false,                        \
  1.1736 -          "Print the time taken by each parallel old gc phase."             \
  1.1737 -          "PrintGCDetails must also be enabled.")                           \
  1.1738 +          "Print the time taken by each phase in ParallelOldGC "            \
  1.1739 +          "(PrintGCDetails must also be enabled)")                          \
  1.1740                                                                              \
  1.1741    develop(bool, TraceParallelOldGCMarkingPhase, false,                      \
  1.1742 -          "Trace parallel old gc marking phase")                            \
  1.1743 +          "Trace marking phase in ParallelOldGC")                           \
  1.1744                                                                              \
  1.1745    develop(bool, TraceParallelOldGCSummaryPhase, false,                      \
  1.1746 -          "Trace parallel old gc summary phase")                            \
  1.1747 +          "Trace summary phase in ParallelOldGC")                           \
  1.1748                                                                              \
  1.1749    develop(bool, TraceParallelOldGCCompactionPhase, false,                   \
  1.1750 -          "Trace parallel old gc compaction phase")                         \
  1.1751 +          "Trace compaction phase in ParallelOldGC")                        \
  1.1752                                                                              \
  1.1753    develop(bool, TraceParallelOldGCDensePrefix, false,                       \
  1.1754 -          "Trace parallel old gc dense prefix computation")                 \
  1.1755 +          "Trace dense prefix computation for ParallelOldGC")               \
  1.1756                                                                              \
  1.1757    develop(bool, IgnoreLibthreadGPFault, false,                              \
  1.1758            "Suppress workaround for libthread GP fault")                     \
  1.1759                                                                              \
  1.1760    product(bool, PrintJNIGCStalls, false,                                    \
  1.1761 -          "Print diagnostic message when GC is stalled"                     \
  1.1762 +          "Print diagnostic message when GC is stalled "                    \
  1.1763            "by JNI critical section")                                        \
  1.1764                                                                              \
  1.1765    experimental(double, ObjectCountCutOffPercent, 0.5,                       \
  1.1766            "The percentage of the used heap that the instances of a class "  \
  1.1767 -          "must occupy for the class to generate a trace event.")           \
  1.1768 +          "must occupy for the class to generate a trace event")            \
  1.1769                                                                              \
  1.1770    /* GC log rotation setting */                                             \
  1.1771                                                                              \
  1.1772    product(bool, UseGCLogFileRotation, false,                                \
  1.1773 -          "Prevent large gclog file for long running app. "                 \
  1.1774 -          "Requires -Xloggc:<filename>")                                    \
  1.1775 +          "Rotate gclog files (for long running applications). It requires "\
  1.1776 +          "-Xloggc:<filename>")                                             \
  1.1777                                                                              \
  1.1778    product(uintx, NumberOfGCLogFiles, 0,                                     \
  1.1779 -          "Number of gclog files in rotation, "                             \
  1.1780 -          "Default: 0, no rotation")                                        \
  1.1781 +          "Number of gclog files in rotation "                              \
  1.1782 +          "(default: 0, no rotation)")                                      \
  1.1783                                                                              \
  1.1784    product(uintx, GCLogFileSize, 0,                                          \
  1.1785 -          "GC log file size, Default: 0 bytes, no rotation "                \
  1.1786 -          "Only valid with UseGCLogFileRotation")                           \
  1.1787 +          "GC log file size (default: 0 bytes, no rotation). "              \
  1.1788 +          "It requires UseGCLogFileRotation")                               \
  1.1789                                                                              \
  1.1790    /* JVMTI heap profiling */                                                \
  1.1791                                                                              \
  1.1792 @@ -2437,40 +2498,40 @@
  1.1793            "Generate range checks for array accesses")                       \
  1.1794                                                                              \
  1.1795    develop_pd(bool, ImplicitNullChecks,                                      \
  1.1796 -          "generate code for implicit null checks")                         \
  1.1797 +          "Generate code for implicit null checks")                         \
  1.1798                                                                              \
  1.1799    product(bool, PrintSafepointStatistics, false,                            \
  1.1800 -          "print statistics about safepoint synchronization")               \
  1.1801 +          "Print statistics about safepoint synchronization")               \
  1.1802                                                                              \
  1.1803    product(intx, PrintSafepointStatisticsCount, 300,                         \
  1.1804 -          "total number of safepoint statistics collected "                 \
  1.1805 +          "Total number of safepoint statistics collected "                 \
  1.1806            "before printing them out")                                       \
  1.1807                                                                              \
  1.1808    product(intx, PrintSafepointStatisticsTimeout,  -1,                       \
  1.1809 -          "print safepoint statistics only when safepoint takes"            \
  1.1810 -          " more than PrintSafepointSatisticsTimeout in millis")            \
  1.1811 +          "Print safepoint statistics only when safepoint takes "           \
  1.1812 +          "more than PrintSafepointSatisticsTimeout in millis")             \
  1.1813                                                                              \
  1.1814    product(bool, TraceSafepointCleanupTime, false,                           \
  1.1815 -          "print the break down of clean up tasks performed during"         \
  1.1816 -          " safepoint")                                                     \
  1.1817 +          "Print the break down of clean up tasks performed during "        \
  1.1818 +          "safepoint")                                                      \
  1.1819                                                                              \
  1.1820    product(bool, Inline, true,                                               \
  1.1821 -          "enable inlining")                                                \
  1.1822 +          "Enable inlining")                                                \
  1.1823                                                                              \
  1.1824    product(bool, ClipInlining, true,                                         \
  1.1825 -          "clip inlining if aggregate method exceeds DesiredMethodLimit")   \
  1.1826 +          "Clip inlining if aggregate method exceeds DesiredMethodLimit")   \
  1.1827                                                                              \
  1.1828    develop(bool, UseCHA, true,                                               \
  1.1829 -          "enable CHA")                                                     \
  1.1830 +          "Enable CHA")                                                     \
  1.1831                                                                              \
  1.1832    product(bool, UseTypeProfile, true,                                       \
  1.1833            "Check interpreter profile for historically monomorphic calls")   \
  1.1834                                                                              \
  1.1835    notproduct(bool, TimeCompiler, false,                                     \
  1.1836 -          "time the compiler")                                              \
  1.1837 +          "Time the compiler")                                              \
  1.1838                                                                              \
  1.1839    diagnostic(bool, PrintInlining, false,                                    \
  1.1840 -          "prints inlining optimizations")                                  \
  1.1841 +          "Print inlining optimizations")                                   \
  1.1842                                                                              \
  1.1843    product(bool, UsePopCountInstruction, false,                              \
  1.1844            "Use population count instruction")                               \
  1.1845 @@ -2482,56 +2543,59 @@
  1.1846            "Print when methods are replaced do to recompilation")            \
  1.1847                                                                              \
  1.1848    develop(bool, PrintMethodFlushing, false,                                 \
  1.1849 -          "print the nmethods being flushed")                               \
  1.1850 +          "Print the nmethods being flushed")                               \
  1.1851                                                                              \
  1.1852    develop(bool, UseRelocIndex, false,                                       \
  1.1853 -         "use an index to speed random access to relocations")              \
  1.1854 +          "Use an index to speed random access to relocations")             \
  1.1855                                                                              \
  1.1856    develop(bool, StressCodeBuffers, false,                                   \
  1.1857 -         "Exercise code buffer expansion and other rare state changes")     \
  1.1858 +          "Exercise code buffer expansion and other rare state changes")    \
  1.1859                                                                              \
  1.1860    diagnostic(bool, DebugNonSafepoints, trueInDebug,                         \
  1.1861 -         "Generate extra debugging info for non-safepoints in nmethods")    \
  1.1862 +          "Generate extra debugging information for non-safepoints in "     \
  1.1863 +          "nmethods")                                                       \
  1.1864                                                                              \
  1.1865    product(bool, PrintVMOptions, false,                                      \
  1.1866 -         "Print flags that appeared on the command line")                   \
  1.1867 +          "Print flags that appeared on the command line")                  \
  1.1868                                                                              \
  1.1869    product(bool, IgnoreUnrecognizedVMOptions, false,                         \
  1.1870 -         "Ignore unrecognized VM options")                                  \
  1.1871 +          "Ignore unrecognized VM options")                                 \
  1.1872                                                                              \
  1.1873    product(bool, PrintCommandLineFlags, false,                               \
  1.1874 -         "Print flags specified on command line or set by ergonomics")      \
  1.1875 +          "Print flags specified on command line or set by ergonomics")     \
  1.1876                                                                              \
  1.1877    product(bool, PrintFlagsInitial, false,                                   \
  1.1878 -         "Print all VM flags before argument processing and exit VM")       \
  1.1879 +          "Print all VM flags before argument processing and exit VM")      \
  1.1880                                                                              \
  1.1881    product(bool, PrintFlagsFinal, false,                                     \
  1.1882 -         "Print all VM flags after argument and ergonomic processing")      \
  1.1883 +          "Print all VM flags after argument and ergonomic processing")     \
  1.1884                                                                              \
  1.1885    notproduct(bool, PrintFlagsWithComments, false,                           \
  1.1886 -         "Print all VM flags with default values and descriptions and exit")\
  1.1887 +          "Print all VM flags with default values and descriptions and "    \
  1.1888 +          "exit")                                                           \
  1.1889                                                                              \
  1.1890    diagnostic(bool, SerializeVMOutput, true,                                 \
  1.1891 -         "Use a mutex to serialize output to tty and hotspot.log")          \
  1.1892 +          "Use a mutex to serialize output to tty and LogFile")             \
  1.1893                                                                              \
  1.1894    diagnostic(bool, DisplayVMOutput, true,                                   \
  1.1895 -         "Display all VM output on the tty, independently of LogVMOutput")  \
  1.1896 -                                                                            \
  1.1897 -  diagnostic(bool, LogVMOutput, trueInDebug,                                \
  1.1898 -         "Save VM output to hotspot.log, or to LogFile")                    \
  1.1899 +          "Display all VM output on the tty, independently of LogVMOutput") \
  1.1900 +                                                                            \
  1.1901 +  diagnostic(bool, LogVMOutput, false,                                      \
  1.1902 +          "Save VM output to LogFile")                                      \
  1.1903                                                                              \
  1.1904    diagnostic(ccstr, LogFile, NULL,                                          \
  1.1905 -         "If LogVMOutput is on, save VM output to this file [hotspot.log]") \
  1.1906 +          "If LogVMOutput or LogCompilation is on, save VM output to "      \
  1.1907 +          "this file [default: ./hotspot_pid%p.log] (%p replaced with pid)")\
  1.1908                                                                              \
  1.1909    product(ccstr, ErrorFile, NULL,                                           \
  1.1910 -         "If an error occurs, save the error data to this file "            \
  1.1911 -         "[default: ./hs_err_pid%p.log] (%p replaced with pid)")            \
  1.1912 +          "If an error occurs, save the error data to this file "           \
  1.1913 +          "[default: ./hs_err_pid%p.log] (%p replaced with pid)")           \
  1.1914                                                                              \
  1.1915    product(bool, DisplayVMOutputToStderr, false,                             \
  1.1916 -         "If DisplayVMOutput is true, display all VM output to stderr")     \
  1.1917 +          "If DisplayVMOutput is true, display all VM output to stderr")    \
  1.1918                                                                              \
  1.1919    product(bool, DisplayVMOutputToStdout, false,                             \
  1.1920 -         "If DisplayVMOutput is true, display all VM output to stdout")     \
  1.1921 +          "If DisplayVMOutput is true, display all VM output to stdout")    \
  1.1922                                                                              \
  1.1923    product(bool, UseHeavyMonitors, false,                                    \
  1.1924            "use heavyweight instead of lightweight Java monitors")           \
  1.1925 @@ -2539,6 +2603,9 @@
  1.1926    product(bool, PrintStringTableStatistics, false,                          \
  1.1927            "print statistics about the StringTable and SymbolTable")         \
  1.1928                                                                              \
  1.1929 +  diagnostic(bool, VerifyStringTableAtExit, false,                          \
  1.1930 +          "verify StringTable contents at exit")                            \
  1.1931 +                                                                            \
  1.1932    notproduct(bool, PrintSymbolTableSizeHistogram, false,                    \
  1.1933            "print histogram of the symbol table")                            \
  1.1934                                                                              \
  1.1935 @@ -2552,7 +2619,7 @@
  1.1936                                                                              \
  1.1937    notproduct(ccstr, AbortVMOnExceptionMessage, NULL,                        \
  1.1938            "Call fatal if the exception pointed by AbortVMOnException "      \
  1.1939 -          "has this message.")                                              \
  1.1940 +          "has this message")                                               \
  1.1941                                                                              \
  1.1942    develop(bool, DebugVtables, false,                                        \
  1.1943            "add debugging code to vtable dispatch")                          \
  1.1944 @@ -2617,31 +2684,44 @@
  1.1945    product(bool, AggressiveOpts, false,                                      \
  1.1946            "Enable aggressive optimizations - see arguments.cpp")            \
  1.1947                                                                              \
  1.1948 +  product_pd(uintx, TypeProfileLevel,                                       \
  1.1949 +          "=XYZ, with Z: Type profiling of arguments at call; "             \
  1.1950 +                     "Y: Type profiling of return value at call; "          \
  1.1951 +                     "X: Type profiling of parameters to methods; "         \
  1.1952 +          "X, Y and Z in 0=off ; 1=jsr292 only; 2=all methods")             \
  1.1953 +                                                                            \
  1.1954 +  product(intx, TypeProfileArgsLimit,     2,                                \
  1.1955 +          "max number of call arguments to consider for type profiling")    \
  1.1956 +                                                                            \
  1.1957 +  product(intx, TypeProfileParmsLimit,    2,                                \
  1.1958 +          "max number of incoming parameters to consider for type profiling"\
  1.1959 +          ", -1 for all")                                                   \
  1.1960 +                                                                            \
  1.1961    /* statistics */                                                          \
  1.1962    develop(bool, CountCompiledCalls, false,                                  \
  1.1963 -          "counts method invocations")                                      \
  1.1964 +          "Count method invocations")                                       \
  1.1965                                                                              \
  1.1966    notproduct(bool, CountRuntimeCalls, false,                                \
  1.1967 -          "counts VM runtime calls")                                        \
  1.1968 +          "Count VM runtime calls")                                         \
  1.1969                                                                              \
  1.1970    develop(bool, CountJNICalls, false,                                       \
  1.1971 -          "counts jni method invocations")                                  \
  1.1972 +          "Count jni method invocations")                                   \
  1.1973                                                                              \
  1.1974    notproduct(bool, CountJVMCalls, false,                                    \
  1.1975 -          "counts jvm method invocations")                                  \
  1.1976 +          "Count jvm method invocations")                                   \
  1.1977                                                                              \
  1.1978    notproduct(bool, CountRemovableExceptions, false,                         \
  1.1979 -          "count exceptions that could be replaced by branches due to "     \
  1.1980 +          "Count exceptions that could be replaced by branches due to "     \
  1.1981            "inlining")                                                       \
  1.1982                                                                              \
  1.1983    notproduct(bool, ICMissHistogram, false,                                  \
  1.1984 -          "produce histogram of IC misses")                                 \
  1.1985 +          "Produce histogram of IC misses")                                 \
  1.1986                                                                              \
  1.1987    notproduct(bool, PrintClassStatistics, false,                             \
  1.1988 -          "prints class statistics at end of run")                          \
  1.1989 +          "Print class statistics at end of run")                           \
  1.1990                                                                              \
  1.1991    notproduct(bool, PrintMethodStatistics, false,                            \
  1.1992 -          "prints method statistics at end of run")                         \
  1.1993 +          "Print method statistics at end of run")                          \
  1.1994                                                                              \
  1.1995    /* interpreter */                                                         \
  1.1996    develop(bool, ClearInterpreterLocals, false,                              \
  1.1997 @@ -2655,7 +2735,7 @@
  1.1998            "Rewrite frequently used bytecode pairs into a single bytecode")  \
  1.1999                                                                              \
  1.2000    diagnostic(bool, PrintInterpreter, false,                                 \
  1.2001 -          "Prints the generated interpreter code")                          \
  1.2002 +          "Print the generated interpreter code")                           \
  1.2003                                                                              \
  1.2004    product(bool, UseInterpreter, true,                                       \
  1.2005            "Use interpreter for non-compiled methods")                       \
  1.2006 @@ -2673,8 +2753,8 @@
  1.2007            "Use fast method entry code for accessor methods")                \
  1.2008                                                                              \
  1.2009    product_pd(bool, UseOnStackReplacement,                                   \
  1.2010 -           "Use on stack replacement, calls runtime if invoc. counter "     \
  1.2011 -           "overflows in loop")                                             \
  1.2012 +          "Use on stack replacement, calls runtime if invoc. counter "      \
  1.2013 +          "overflows in loop")                                              \
  1.2014                                                                              \
  1.2015    notproduct(bool, TraceOnStackReplacement, false,                          \
  1.2016            "Trace on stack replacement")                                     \
  1.2017 @@ -2722,10 +2802,10 @@
  1.2018            "Trace frequency based inlining")                                 \
  1.2019                                                                              \
  1.2020    develop_pd(bool, InlineIntrinsics,                                        \
  1.2021 -           "Inline intrinsics that can be statically resolved")             \
  1.2022 +          "Inline intrinsics that can be statically resolved")              \
  1.2023                                                                              \
  1.2024    product_pd(bool, ProfileInterpreter,                                      \
  1.2025 -           "Profile at the bytecode level during interpretation")           \
  1.2026 +          "Profile at the bytecode level during interpretation")            \
  1.2027                                                                              \
  1.2028    develop(bool, TraceProfileInterpreter, false,                             \
  1.2029            "Trace profiling at the bytecode level during interpretation. "   \
  1.2030 @@ -2740,7 +2820,7 @@
  1.2031            "CompileThreshold) before using the method's profile")            \
  1.2032                                                                              \
  1.2033    develop(bool, PrintMethodData, false,                                     \
  1.2034 -           "Print the results of +ProfileInterpreter at end of run")        \
  1.2035 +          "Print the results of +ProfileInterpreter at end of run")         \
  1.2036                                                                              \
  1.2037    develop(bool, VerifyDataPointer, trueInDebug,                             \
  1.2038            "Verify the method data pointer during interpreter profiling")    \
  1.2039 @@ -2755,7 +2835,7 @@
  1.2040                                                                              \
  1.2041    /* compilation */                                                         \
  1.2042    product(bool, UseCompiler, true,                                          \
  1.2043 -          "use compilation")                                                \
  1.2044 +          "Use Just-In-Time compilation")                                   \
  1.2045                                                                              \
  1.2046    develop(bool, TraceCompilationPolicy, false,                              \
  1.2047            "Trace compilation policy")                                       \
  1.2048 @@ -2764,20 +2844,21 @@
  1.2049            "Time the compilation policy")                                    \
  1.2050                                                                              \
  1.2051    product(bool, UseCounterDecay, true,                                      \
  1.2052 -           "adjust recompilation counters")                                 \
  1.2053 +          "Adjust recompilation counters")                                  \
  1.2054                                                                              \
  1.2055    develop(intx, CounterHalfLifeTime,    30,                                 \
  1.2056 -          "half-life time of invocation counters (in secs)")                \
  1.2057 +          "Half-life time of invocation counters (in seconds)")             \
  1.2058                                                                              \
  1.2059    develop(intx, CounterDecayMinIntervalLength,   500,                       \
  1.2060 -          "Min. ms. between invocation of CounterDecay")                    \
  1.2061 +          "The minimum interval (in milliseconds) between invocation of "   \
  1.2062 +          "CounterDecay")                                                   \
  1.2063                                                                              \
  1.2064    product(bool, AlwaysCompileLoopMethods, false,                            \
  1.2065 -          "when using recompilation, never interpret methods "              \
  1.2066 +          "When using recompilation, never interpret methods "              \
  1.2067            "containing loops")                                               \
  1.2068                                                                              \
  1.2069    product(bool, DontCompileHugeMethods, true,                               \
  1.2070 -          "don't compile methods > HugeMethodLimit")                        \
  1.2071 +          "Do not compile methods > HugeMethodLimit")                       \
  1.2072                                                                              \
  1.2073    /* Bytecode escape analysis estimation. */                                \
  1.2074    product(bool, EstimateArgEscape, true,                                    \
  1.2075 @@ -2787,10 +2868,10 @@
  1.2076            "How much tracing to do of bytecode escape analysis estimates")   \
  1.2077                                                                              \
  1.2078    product(intx, MaxBCEAEstimateLevel, 5,                                    \
  1.2079 -          "Maximum number of nested calls that are analyzed by BC EA.")     \
  1.2080 +          "Maximum number of nested calls that are analyzed by BC EA")      \
  1.2081                                                                              \
  1.2082    product(intx, MaxBCEAEstimateSize, 150,                                   \
  1.2083 -          "Maximum bytecode size of a method to be analyzed by BC EA.")     \
  1.2084 +          "Maximum bytecode size of a method to be analyzed by BC EA")      \
  1.2085                                                                              \
  1.2086    product(intx,  AllocatePrefetchStyle, 1,                                  \
  1.2087            "0 = no prefetch, "                                               \
  1.2088 @@ -2805,7 +2886,8 @@
  1.2089            "Number of lines to prefetch ahead of array allocation pointer")  \
  1.2090                                                                              \
  1.2091    product(intx,  AllocateInstancePrefetchLines, 1,                          \
  1.2092 -          "Number of lines to prefetch ahead of instance allocation pointer") \
  1.2093 +          "Number of lines to prefetch ahead of instance allocation "       \
  1.2094 +          "pointer")                                                        \
  1.2095                                                                              \
  1.2096    product(intx,  AllocatePrefetchStepSize, 16,                              \
  1.2097            "Step size in bytes of sequential prefetch instructions")         \
  1.2098 @@ -2825,8 +2907,8 @@
  1.2099            "(0 means off)")                                                  \
  1.2100                                                                              \
  1.2101    product(intx, MaxJavaStackTraceDepth, 1024,                               \
  1.2102 -          "Max. no. of lines in the stack trace for Java exceptions "       \
  1.2103 -          "(0 means all)")                                                  \
  1.2104 +          "The maximum number of lines in the stack trace for Java "        \
  1.2105 +          "exceptions (0 means all)")                                       \
  1.2106                                                                              \
  1.2107    NOT_EMBEDDED(diagnostic(intx, GuaranteedSafepointInterval, 1000,          \
  1.2108            "Guarantee a safepoint (at least) every so many milliseconds "    \
  1.2109 @@ -2845,11 +2927,15 @@
  1.2110    product(intx, NmethodSweepCheckInterval, 5,                               \
  1.2111            "Compilers wake up every n seconds to possibly sweep nmethods")   \
  1.2112                                                                              \
  1.2113 +  product(intx, NmethodSweepActivity, 10,                                   \
  1.2114 +          "Removes cold nmethods from code cache if > 0. Higher values "    \
  1.2115 +          "result in more aggressive sweeping")                             \
  1.2116 +                                                                            \
  1.2117    notproduct(bool, LogSweeper, false,                                       \
  1.2118 -            "Keep a ring buffer of sweeper activity")                       \
  1.2119 +          "Keep a ring buffer of sweeper activity")                         \
  1.2120                                                                              \
  1.2121    notproduct(intx, SweeperLogEntries, 1024,                                 \
  1.2122 -            "Number of records in the ring buffer of sweeper activity")     \
  1.2123 +          "Number of records in the ring buffer of sweeper activity")       \
  1.2124                                                                              \
  1.2125    notproduct(intx, MemProfilingInterval, 500,                               \
  1.2126            "Time between each invocation of the MemProfiler")                \
  1.2127 @@ -2892,34 +2978,35 @@
  1.2128            "less than this")                                                 \
  1.2129                                                                              \
  1.2130    product(intx, MaxInlineSize, 35,                                          \
  1.2131 -          "maximum bytecode size of a method to be inlined")                \
  1.2132 +          "The maximum bytecode size of a method to be inlined")            \
  1.2133                                                                              \
  1.2134    product_pd(intx, FreqInlineSize,                                          \
  1.2135 -          "maximum bytecode size of a frequent method to be inlined")       \
  1.2136 +          "The maximum bytecode size of a frequent method to be inlined")   \
  1.2137                                                                              \
  1.2138    product(intx, MaxTrivialSize, 6,                                          \
  1.2139 -          "maximum bytecode size of a trivial method to be inlined")        \
  1.2140 +          "The maximum bytecode size of a trivial method to be inlined")    \
  1.2141                                                                              \
  1.2142    product(intx, MinInliningThreshold, 250,                                  \
  1.2143 -          "min. invocation count a method needs to have to be inlined")     \
  1.2144 +          "The minimum invocation count a method needs to have to be "      \
  1.2145 +          "inlined")                                                        \
  1.2146                                                                              \
  1.2147    develop(intx, MethodHistogramCutoff, 100,                                 \
  1.2148 -          "cutoff value for method invoc. histogram (+CountCalls)")         \
  1.2149 +          "The cutoff value for method invocation histogram (+CountCalls)") \
  1.2150                                                                              \
  1.2151    develop(intx, ProfilerNumberOfInterpretedMethods, 25,                     \
  1.2152 -          "# of interpreted methods to show in profile")                    \
  1.2153 +          "Number of interpreted methods to show in profile")               \
  1.2154                                                                              \
  1.2155    develop(intx, ProfilerNumberOfCompiledMethods, 25,                        \
  1.2156 -          "# of compiled methods to show in profile")                       \
  1.2157 +          "Number of compiled methods to show in profile")                  \
  1.2158                                                                              \
  1.2159    develop(intx, ProfilerNumberOfStubMethods, 25,                            \
  1.2160 -          "# of stub methods to show in profile")                           \
  1.2161 +          "Number of stub methods to show in profile")                      \
  1.2162                                                                              \
  1.2163    develop(intx, ProfilerNumberOfRuntimeStubNodes, 25,                       \
  1.2164 -          "# of runtime stub nodes to show in profile")                     \
  1.2165 +          "Number of runtime stub nodes to show in profile")                \
  1.2166                                                                              \
  1.2167    product(intx, ProfileIntervalsTicks, 100,                                 \
  1.2168 -          "# of ticks between printing of interval profile "                \
  1.2169 +          "Number of ticks between printing of interval profile "           \
  1.2170            "(+ProfileIntervals)")                                            \
  1.2171                                                                              \
  1.2172    notproduct(intx, ScavengeALotInterval,     1,                             \
  1.2173 @@ -2940,7 +3027,7 @@
  1.2174                                                                              \
  1.2175    develop(intx, MinSleepInterval,     1,                                    \
  1.2176            "Minimum sleep() interval (milliseconds) when "                   \
  1.2177 -          "ConvertSleepToYield is off (used for SOLARIS)")                  \
  1.2178 +          "ConvertSleepToYield is off (used for Solaris)")                  \
  1.2179                                                                              \
  1.2180    develop(intx, ProfilerPCTickThreshold,    15,                             \
  1.2181            "Number of ticks in a PC buckets to be a hotspot")                \
  1.2182 @@ -2955,22 +3042,22 @@
  1.2183            "Mark nmethods non-entrant at registration")                      \
  1.2184                                                                              \
  1.2185    diagnostic(intx, MallocVerifyInterval,     0,                             \
  1.2186 -          "if non-zero, verify C heap after every N calls to "              \
  1.2187 +          "If non-zero, verify C heap after every N calls to "              \
  1.2188            "malloc/realloc/free")                                            \
  1.2189                                                                              \
  1.2190    diagnostic(intx, MallocVerifyStart,     0,                                \
  1.2191 -          "if non-zero, start verifying C heap after Nth call to "          \
  1.2192 +          "If non-zero, start verifying C heap after Nth call to "          \
  1.2193            "malloc/realloc/free")                                            \
  1.2194                                                                              \
  1.2195    diagnostic(uintx, MallocMaxTestWords,     0,                              \
  1.2196 -          "if non-zero, max # of Words that malloc/realloc can allocate "   \
  1.2197 -          "(for testing only)")                                             \
  1.2198 +          "If non-zero, maximum number of words that malloc/realloc can "   \
  1.2199 +          "allocate (for testing only)")                                    \
  1.2200                                                                              \
  1.2201    product(intx, TypeProfileWidth,     2,                                    \
  1.2202 -          "number of receiver types to record in call/cast profile")        \
  1.2203 +          "Number of receiver types to record in call/cast profile")        \
  1.2204                                                                              \
  1.2205    develop(intx, BciProfileWidth,      2,                                    \
  1.2206 -          "number of return bci's to record in ret profile")                \
  1.2207 +          "Number of return bci's to record in ret profile")                \
  1.2208                                                                              \
  1.2209    product(intx, PerMethodRecompilationCutoff, 400,                          \
  1.2210            "After recompiling N times, stay in the interpreter (-1=>'Inf')") \
  1.2211 @@ -3037,7 +3124,7 @@
  1.2212            "Percentage of Eden that can be wasted")                          \
  1.2213                                                                              \
  1.2214    product(uintx, TLABRefillWasteFraction,    64,                            \
  1.2215 -          "Max TLAB waste at a refill (internal fragmentation)")            \
  1.2216 +          "Maximum TLAB waste at a refill (internal fragmentation)")        \
  1.2217                                                                              \
  1.2218    product(uintx, TLABWasteIncrement,    4,                                  \
  1.2219            "Increment allowed waste at slow allocation")                     \
  1.2220 @@ -3046,7 +3133,7 @@
  1.2221            "Ratio of eden/survivor space size")                              \
  1.2222                                                                              \
  1.2223    product(uintx, NewRatio, 2,                                               \
  1.2224 -          "Ratio of new/old generation sizes")                              \
  1.2225 +          "Ratio of old/new generation sizes")                              \
  1.2226                                                                              \
  1.2227    product_pd(uintx, NewSizeThreadIncrease,                                  \
  1.2228            "Additional size added to desired new generation size per "       \
  1.2229 @@ -3058,33 +3145,39 @@
  1.2230    product(uintx, MaxMetaspaceSize, max_uintx,                               \
  1.2231            "Maximum size of Metaspaces (in bytes)")                          \
  1.2232                                                                              \
  1.2233 -  product(uintx, ClassMetaspaceSize, 1*G,                                   \
  1.2234 -          "Maximum size of InstanceKlass area in Metaspace used for "       \
  1.2235 -          "UseCompressedKlassPointers")                                     \
  1.2236 +  product(uintx, CompressedClassSpaceSize, 1*G,                             \
  1.2237 +          "Maximum size of class area in Metaspace when compressed "        \
  1.2238 +          "class pointers are used")                                        \
  1.2239                                                                              \
  1.2240    product(uintx, MinHeapFreeRatio,    40,                                   \
  1.2241 -          "Min percentage of heap free after GC to avoid expansion")        \
  1.2242 +          "The minimum percentage of heap free after GC to avoid expansion."\
  1.2243 +          " For most GCs this applies to the old generation. In G1 it"      \
  1.2244 +          " applies to the whole heap. Not supported by ParallelGC.")       \
  1.2245                                                                              \
  1.2246    product(uintx, MaxHeapFreeRatio,    70,                                   \
  1.2247 -          "Max percentage of heap free after GC to avoid shrinking")        \
  1.2248 +          "The maximum percentage of heap free after GC to avoid shrinking."\
  1.2249 +          " For most GCs this applies to the old generation. In G1 it"      \
  1.2250 +          " applies to the whole heap. Not supported by ParallelGC.")       \
  1.2251                                                                              \
  1.2252    product(intx, SoftRefLRUPolicyMSPerMB, 1000,                              \
  1.2253            "Number of milliseconds per MB of free space in the heap")        \
  1.2254                                                                              \
  1.2255    product(uintx, MinHeapDeltaBytes, ScaleForWordSize(128*K),                \
  1.2256 -          "Min change in heap space due to GC (in bytes)")                  \
  1.2257 +          "The minimum change in heap space due to GC (in bytes)")          \
  1.2258                                                                              \
  1.2259    product(uintx, MinMetaspaceExpansion, ScaleForWordSize(256*K),            \
  1.2260 -          "Min expansion of Metaspace (in bytes)")                          \
  1.2261 +          "The minimum expansion of Metaspace (in bytes)")                  \
  1.2262                                                                              \
  1.2263    product(uintx, MinMetaspaceFreeRatio,    40,                              \
  1.2264 -          "Min percentage of Metaspace free after GC to avoid expansion")   \
  1.2265 +          "The minimum percentage of Metaspace free after GC to avoid "     \
  1.2266 +          "expansion")                                                      \
  1.2267                                                                              \
  1.2268    product(uintx, MaxMetaspaceFreeRatio,    70,                              \
  1.2269 -          "Max percentage of Metaspace free after GC to avoid shrinking")   \
  1.2270 +          "The maximum percentage of Metaspace free after GC to avoid "     \
  1.2271 +          "shrinking")                                                      \
  1.2272                                                                              \
  1.2273    product(uintx, MaxMetaspaceExpansion, ScaleForWordSize(4*M),              \
  1.2274 -          "Max expansion of Metaspace without full GC (in bytes)")          \
  1.2275 +          "The maximum expansion of Metaspace without full GC (in bytes)")  \
  1.2276                                                                              \
  1.2277    product(uintx, QueuedAllocationWarningCount, 0,                           \
  1.2278            "Number of times an allocation that queues behind a GC "          \
  1.2279 @@ -3106,13 +3199,14 @@
  1.2280            "Desired percentage of survivor space used after scavenge")       \
  1.2281                                                                              \
  1.2282    product(uintx, MarkSweepDeadRatio,     5,                                 \
  1.2283 -          "Percentage (0-100) of the old gen allowed as dead wood."         \
  1.2284 -          "Serial mark sweep treats this as both the min and max value."    \
  1.2285 -          "CMS uses this value only if it falls back to mark sweep."        \
  1.2286 -          "Par compact uses a variable scale based on the density of the"   \
  1.2287 -          "generation and treats this as the max value when the heap is"    \
  1.2288 -          "either completely full or completely empty.  Par compact also"   \
  1.2289 -          "has a smaller default value; see arguments.cpp.")                \
  1.2290 +          "Percentage (0-100) of the old gen allowed as dead wood. "        \
  1.2291 +          "Serial mark sweep treats this as both the minimum and maximum "  \
  1.2292 +          "value. "                                                         \
  1.2293 +          "CMS uses this value only if it falls back to mark sweep. "       \
  1.2294 +          "Par compact uses a variable scale based on the density of the "  \
  1.2295 +          "generation and treats this as the maximum value when the heap "  \
  1.2296 +          "is either completely full or completely empty.  Par compact "    \
  1.2297 +          "also has a smaller default value; see arguments.cpp.")           \
  1.2298                                                                              \
  1.2299    product(uintx, MarkSweepAlwaysCompactCount,     4,                        \
  1.2300            "How often should we fully compact the heap (ignoring the dead "  \
  1.2301 @@ -3131,27 +3225,27 @@
  1.2302            "Census for CMS' FreeListSpace")                                  \
  1.2303                                                                              \
  1.2304    develop(uintx, GCExpandToAllocateDelayMillis, 0,                          \
  1.2305 -          "Delay in ms between expansion and allocation")                   \
  1.2306 +          "Delay between expansion and allocation (in milliseconds)")       \
  1.2307                                                                              \
  1.2308    develop(uintx, GCWorkerDelayMillis, 0,                                    \
  1.2309 -          "Delay in ms in scheduling GC workers")                           \
  1.2310 +          "Delay in scheduling GC workers (in milliseconds)")               \
  1.2311                                                                              \
  1.2312    product(intx, DeferThrSuspendLoopCount,     4000,                         \
  1.2313            "(Unstable) Number of times to iterate in safepoint loop "        \
  1.2314 -          " before blocking VM threads ")                                   \
  1.2315 +          "before blocking VM threads ")                                    \
  1.2316                                                                              \
  1.2317    product(intx, DeferPollingPageLoopCount,     -1,                          \
  1.2318            "(Unsafe,Unstable) Number of iterations in safepoint loop "       \
  1.2319            "before changing safepoint polling page to RO ")                  \
  1.2320                                                                              \
  1.2321 -  product(intx, SafepointSpinBeforeYield, 2000,  "(Unstable)")              \
  1.2322 +  product(intx, SafepointSpinBeforeYield, 2000, "(Unstable)")               \
  1.2323                                                                              \
  1.2324    product(bool, PSChunkLargeArrays, true,                                   \
  1.2325 -          "true: process large arrays in chunks")                           \
  1.2326 +          "Process large arrays in chunks")                                 \
  1.2327                                                                              \
  1.2328    product(uintx, GCDrainStackTargetSize, 64,                                \
  1.2329 -          "how many entries we'll try to leave on the stack during "        \
  1.2330 -          "parallel GC")                                                    \
  1.2331 +          "Number of entries we will try to leave on the stack "            \
  1.2332 +          "during parallel gc")                                             \
  1.2333                                                                              \
  1.2334    /* stack parameters */                                                    \
  1.2335    product_pd(intx, StackYellowPages,                                        \
  1.2336 @@ -3161,8 +3255,8 @@
  1.2337            "Number of red zone (unrecoverable overflows) pages")             \
  1.2338                                                                              \
  1.2339    product_pd(intx, StackShadowPages,                                        \
  1.2340 -          "Number of shadow zone (for overflow checking) pages"             \
  1.2341 -          " this should exceed the depth of the VM and native call stack")  \
  1.2342 +          "Number of shadow zone (for overflow checking) pages "            \
  1.2343 +          "this should exceed the depth of the VM and native call stack")   \
  1.2344                                                                              \
  1.2345    product_pd(intx, ThreadStackSize,                                         \
  1.2346            "Thread Stack Size (in Kbytes)")                                  \
  1.2347 @@ -3203,60 +3297,51 @@
  1.2348            "Reserved code cache size (in bytes) - maximum code cache size")  \
  1.2349                                                                              \
  1.2350    product(uintx, CodeCacheMinimumFreeSpace, 500*K,                          \
  1.2351 -          "When less than X space left, we stop compiling.")                \
  1.2352 +          "When less than X space left, we stop compiling")                 \
  1.2353                                                                              \
  1.2354    product_pd(uintx, CodeCacheExpansionSize,                                 \
  1.2355            "Code cache expansion size (in bytes)")                           \
  1.2356                                                                              \
  1.2357    develop_pd(uintx, CodeCacheMinBlockLength,                                \
  1.2358 -          "Minimum number of segments in a code cache block.")              \
  1.2359 +          "Minimum number of segments in a code cache block")               \
  1.2360                                                                              \
  1.2361    notproduct(bool, ExitOnFullCodeCache, false,                              \
  1.2362 -          "Exit the VM if we fill the code cache.")                         \
  1.2363 +          "Exit the VM if we fill the code cache")                          \
  1.2364                                                                              \
  1.2365    product(bool, UseCodeCacheFlushing, true,                                 \
  1.2366            "Attempt to clean the code cache before shutting off compiler")   \
  1.2367                                                                              \
  1.2368 -  product(intx,  MinCodeCacheFlushingInterval, 30,                          \
  1.2369 -          "Min number of seconds between code cache cleaning sessions")     \
  1.2370 -                                                                            \
  1.2371 -  product(uintx,  CodeCacheFlushingMinimumFreeSpace, 1500*K,                \
  1.2372 -          "When less than X space left, start code cache cleaning")         \
  1.2373 -                                                                            \
  1.2374 -  product(uintx, CodeCacheFlushingFraction, 2,                              \
  1.2375 -          "Fraction of the code cache that is flushed when full")           \
  1.2376 -                                                                            \
  1.2377    /* interpreter debugging */                                               \
  1.2378    develop(intx, BinarySwitchThreshold, 5,                                   \
  1.2379            "Minimal number of lookupswitch entries for rewriting to binary " \
  1.2380            "switch")                                                         \
  1.2381                                                                              \
  1.2382    develop(intx, StopInterpreterAt, 0,                                       \
  1.2383 -          "Stops interpreter execution at specified bytecode number")       \
  1.2384 +          "Stop interpreter execution at specified bytecode number")        \
  1.2385                                                                              \
  1.2386    develop(intx, TraceBytecodesAt, 0,                                        \
  1.2387 -          "Traces bytecodes starting with specified bytecode number")       \
  1.2388 +          "Trace bytecodes starting with specified bytecode number")        \
  1.2389                                                                              \
  1.2390    /* compiler interface */                                                  \
  1.2391    develop(intx, CIStart, 0,                                                 \
  1.2392 -          "the id of the first compilation to permit")                      \
  1.2393 +          "The id of the first compilation to permit")                      \
  1.2394                                                                              \
  1.2395    develop(intx, CIStop,    -1,                                              \
  1.2396 -          "the id of the last compilation to permit")                       \
  1.2397 +          "The id of the last compilation to permit")                       \
  1.2398                                                                              \
  1.2399    develop(intx, CIStartOSR,     0,                                          \
  1.2400 -          "the id of the first osr compilation to permit "                  \
  1.2401 +          "The id of the first osr compilation to permit "                  \
  1.2402            "(CICountOSR must be on)")                                        \
  1.2403                                                                              \
  1.2404    develop(intx, CIStopOSR,    -1,                                           \
  1.2405 -          "the id of the last osr compilation to permit "                   \
  1.2406 +          "The id of the last osr compilation to permit "                   \
  1.2407            "(CICountOSR must be on)")                                        \
  1.2408                                                                              \
  1.2409    develop(intx, CIBreakAtOSR,    -1,                                        \
  1.2410 -          "id of osr compilation to break at")                              \
  1.2411 +          "The id of osr compilation to break at")                          \
  1.2412                                                                              \
  1.2413    develop(intx, CIBreakAt,    -1,                                           \
  1.2414 -          "id of compilation to break at")                                  \
  1.2415 +          "The id of compilation to break at")                              \
  1.2416                                                                              \
  1.2417    product(ccstrlist, CompileOnly, "",                                       \
  1.2418            "List of methods (pkg/class.name) to restrict compilation to")    \
  1.2419 @@ -3275,11 +3360,11 @@
  1.2420            "[default: ./replay_pid%p.log] (%p replaced with pid)")           \
  1.2421                                                                              \
  1.2422    develop(intx, ReplaySuppressInitializers, 2,                              \
  1.2423 -          "Controls handling of class initialization during replay"         \
  1.2424 -          "0 - don't do anything special"                                   \
  1.2425 -          "1 - treat all class initializers as empty"                       \
  1.2426 -          "2 - treat class initializers for application classes as empty"   \
  1.2427 -          "3 - allow all class initializers to run during bootstrap but"    \
  1.2428 +          "Control handling of class initialization during replay: "        \
  1.2429 +          "0 - don't do anything special; "                                 \
  1.2430 +          "1 - treat all class initializers as empty; "                     \
  1.2431 +          "2 - treat class initializers for application classes as empty; " \
  1.2432 +          "3 - allow all class initializers to run during bootstrap but "   \
  1.2433            "    pretend they are empty after starting replay")               \
  1.2434                                                                              \
  1.2435    develop(bool, ReplayIgnoreInitErrors, false,                              \
  1.2436 @@ -3308,14 +3393,15 @@
  1.2437            "0 : Normal.                                                     "\
  1.2438            "    VM chooses priorities that are appropriate for normal       "\
  1.2439            "    applications. On Solaris NORM_PRIORITY and above are mapped "\
  1.2440 -          "    to normal native priority. Java priorities below NORM_PRIORITY"\
  1.2441 -          "    map to lower native priority values. On Windows applications"\
  1.2442 -          "    are allowed to use higher native priorities. However, with  "\
  1.2443 -          "    ThreadPriorityPolicy=0, VM will not use the highest possible"\
  1.2444 -          "    native priority, THREAD_PRIORITY_TIME_CRITICAL, as it may   "\
  1.2445 -          "    interfere with system threads. On Linux thread priorities   "\
  1.2446 -          "    are ignored because the OS does not support static priority "\
  1.2447 -          "    in SCHED_OTHER scheduling class which is the only choice for"\
  1.2448 +          "    to normal native priority. Java priorities below "           \
  1.2449 +          "    NORM_PRIORITY map to lower native priority values. On       "\
  1.2450 +          "    Windows applications are allowed to use higher native       "\
  1.2451 +          "    priorities. However, with ThreadPriorityPolicy=0, VM will   "\
  1.2452 +          "    not use the highest possible native priority,               "\
  1.2453 +          "    THREAD_PRIORITY_TIME_CRITICAL, as it may interfere with     "\
  1.2454 +          "    system threads. On Linux thread priorities are ignored      "\
  1.2455 +          "    because the OS does not support static priority in          "\
  1.2456 +          "    SCHED_OTHER scheduling class which is the only choice for   "\
  1.2457            "    non-root, non-realtime applications.                        "\
  1.2458            "1 : Aggressive.                                                 "\
  1.2459            "    Java thread priorities map over to the entire range of      "\
  1.2460 @@ -3346,16 +3432,35 @@
  1.2461    product(bool, VMThreadHintNoPreempt, false,                               \
  1.2462            "(Solaris only) Give VM thread an extra quanta")                  \
  1.2463                                                                              \
  1.2464 -  product(intx, JavaPriority1_To_OSPriority, -1, "Map Java priorities to OS priorities") \
  1.2465 -  product(intx, JavaPriority2_To_OSPriority, -1, "Map Java priorities to OS priorities") \
  1.2466 -  product(intx, JavaPriority3_To_OSPriority, -1, "Map Java priorities to OS priorities") \
  1.2467 -  product(intx, JavaPriority4_To_OSPriority, -1, "Map Java priorities to OS priorities") \
  1.2468 -  product(intx, JavaPriority5_To_OSPriority, -1, "Map Java priorities to OS priorities") \
  1.2469 -  product(intx, JavaPriority6_To_OSPriority, -1, "Map Java priorities to OS priorities") \
  1.2470 -  product(intx, JavaPriority7_To_OSPriority, -1, "Map Java priorities to OS priorities") \
  1.2471 -  product(intx, JavaPriority8_To_OSPriority, -1, "Map Java priorities to OS priorities") \
  1.2472 -  product(intx, JavaPriority9_To_OSPriority, -1, "Map Java priorities to OS priorities") \
  1.2473 -  product(intx, JavaPriority10_To_OSPriority,-1, "Map Java priorities to OS priorities") \
  1.2474 +  product(intx, JavaPriority1_To_OSPriority, -1,                            \
  1.2475 +          "Map Java priorities to OS priorities")                           \
  1.2476 +                                                                            \
  1.2477 +  product(intx, JavaPriority2_To_OSPriority, -1,                            \
  1.2478 +          "Map Java priorities to OS priorities")                           \
  1.2479 +                                                                            \
  1.2480 +  product(intx, JavaPriority3_To_OSPriority, -1,                            \
  1.2481 +          "Map Java priorities to OS priorities")                           \
  1.2482 +                                                                            \
  1.2483 +  product(intx, JavaPriority4_To_OSPriority, -1,                            \
  1.2484 +          "Map Java priorities to OS priorities")                           \
  1.2485 +                                                                            \
  1.2486 +  product(intx, JavaPriority5_To_OSPriority, -1,                            \
  1.2487 +          "Map Java priorities to OS priorities")                           \
  1.2488 +                                                                            \
  1.2489 +  product(intx, JavaPriority6_To_OSPriority, -1,                            \
  1.2490 +          "Map Java priorities to OS priorities")                           \
  1.2491 +                                                                            \
  1.2492 +  product(intx, JavaPriority7_To_OSPriority, -1,                            \
  1.2493 +          "Map Java priorities to OS priorities")                           \
  1.2494 +                                                                            \
  1.2495 +  product(intx, JavaPriority8_To_OSPriority, -1,                            \
  1.2496 +          "Map Java priorities to OS priorities")                           \
  1.2497 +                                                                            \
  1.2498 +  product(intx, JavaPriority9_To_OSPriority, -1,                            \
  1.2499 +          "Map Java priorities to OS priorities")                           \
  1.2500 +                                                                            \
  1.2501 +  product(intx, JavaPriority10_To_OSPriority,-1,                            \
  1.2502 +          "Map Java priorities to OS priorities")                           \
  1.2503                                                                              \
  1.2504    experimental(bool, UseCriticalJavaThreadPriority, false,                  \
  1.2505            "Java thread priority 10 maps to critical scheduling priority")   \
  1.2506 @@ -3386,37 +3491,38 @@
  1.2507            "Used with +TraceLongCompiles")                                   \
  1.2508                                                                              \
  1.2509    product(intx, StarvationMonitorInterval,    200,                          \
  1.2510 -          "Pause between each check in ms")                                 \
  1.2511 +          "Pause between each check (in milliseconds)")                     \
  1.2512                                                                              \
  1.2513    /* recompilation */                                                       \
  1.2514    product_pd(intx, CompileThreshold,                                        \
  1.2515            "number of interpreted method invocations before (re-)compiling") \
  1.2516                                                                              \
  1.2517    product_pd(intx, BackEdgeThreshold,                                       \
  1.2518 -          "Interpreter Back edge threshold at which an OSR compilation is invoked")\
  1.2519 +          "Interpreter Back edge threshold at which an OSR compilation is " \
  1.2520 +          "invoked")                                                        \
  1.2521                                                                              \
  1.2522    product(intx, Tier0InvokeNotifyFreqLog, 7,                                \
  1.2523 -          "Interpreter (tier 0) invocation notification frequency.")        \
  1.2524 +          "Interpreter (tier 0) invocation notification frequency")         \
  1.2525                                                                              \
  1.2526    product(intx, Tier2InvokeNotifyFreqLog, 11,                               \
  1.2527 -          "C1 without MDO (tier 2) invocation notification frequency.")     \
  1.2528 +          "C1 without MDO (tier 2) invocation notification frequency")      \
  1.2529                                                                              \
  1.2530    product(intx, Tier3InvokeNotifyFreqLog, 10,                               \
  1.2531            "C1 with MDO profiling (tier 3) invocation notification "         \
  1.2532 -          "frequency.")                                                     \
  1.2533 +          "frequency")                                                      \
  1.2534                                                                              \
  1.2535    product(intx, Tier23InlineeNotifyFreqLog, 20,                             \
  1.2536            "Inlinee invocation (tiers 2 and 3) notification frequency")      \
  1.2537                                                                              \
  1.2538    product(intx, Tier0BackedgeNotifyFreqLog, 10,                             \
  1.2539 -          "Interpreter (tier 0) invocation notification frequency.")        \
  1.2540 +          "Interpreter (tier 0) invocation notification frequency")         \
  1.2541                                                                              \
  1.2542    product(intx, Tier2BackedgeNotifyFreqLog, 14,                             \
  1.2543 -          "C1 without MDO (tier 2) invocation notification frequency.")     \
  1.2544 +          "C1 without MDO (tier 2) invocation notification frequency")      \
  1.2545                                                                              \
  1.2546    product(intx, Tier3BackedgeNotifyFreqLog, 13,                             \
  1.2547            "C1 with MDO profiling (tier 3) invocation notification "         \
  1.2548 -          "frequency.")                                                     \
  1.2549 +          "frequency")                                                      \
  1.2550                                                                              \
  1.2551    product(intx, Tier2CompileThreshold, 0,                                   \
  1.2552            "threshold at which tier 2 compilation is invoked")               \
  1.2553 @@ -3433,7 +3539,7 @@
  1.2554                                                                              \
  1.2555    product(intx, Tier3CompileThreshold, 2000,                                \
  1.2556            "Threshold at which tier 3 compilation is invoked (invocation "   \
  1.2557 -          "minimum must be satisfied.")                                     \
  1.2558 +          "minimum must be satisfied")                                      \
  1.2559                                                                              \
  1.2560    product(intx, Tier3BackEdgeThreshold,  60000,                             \
  1.2561            "Back edge threshold at which tier 3 OSR compilation is invoked") \
  1.2562 @@ -3447,7 +3553,7 @@
  1.2563                                                                              \
  1.2564    product(intx, Tier4CompileThreshold, 15000,                               \
  1.2565            "Threshold at which tier 4 compilation is invoked (invocation "   \
  1.2566 -          "minimum must be satisfied.")                                     \
  1.2567 +          "minimum must be satisfied")                                      \
  1.2568                                                                              \
  1.2569    product(intx, Tier4BackEdgeThreshold, 40000,                              \
  1.2570            "Back edge threshold at which tier 4 OSR compilation is invoked") \
  1.2571 @@ -3476,12 +3582,12 @@
  1.2572            "Stop at given compilation level")                                \
  1.2573                                                                              \
  1.2574    product(intx, Tier0ProfilingStartPercentage, 200,                         \
  1.2575 -          "Start profiling in interpreter if the counters exceed tier 3"    \
  1.2576 +          "Start profiling in interpreter if the counters exceed tier 3 "   \
  1.2577            "thresholds by the specified percentage")                         \
  1.2578                                                                              \
  1.2579    product(uintx, IncreaseFirstTierCompileThresholdAt, 50,                   \
  1.2580 -          "Increase the compile threshold for C1 compilation if the code"   \
  1.2581 -          "cache is filled by the specified percentage.")                   \
  1.2582 +          "Increase the compile threshold for C1 compilation if the code "  \
  1.2583 +          "cache is filled by the specified percentage")                    \
  1.2584                                                                              \
  1.2585    product(intx, TieredRateUpdateMinTime, 1,                                 \
  1.2586            "Minimum rate sampling interval (in milliseconds)")               \
  1.2587 @@ -3496,24 +3602,26 @@
  1.2588            "Print tiered events notifications")                              \
  1.2589                                                                              \
  1.2590    product_pd(intx, OnStackReplacePercentage,                                \
  1.2591 -          "NON_TIERED number of method invocations/branches (expressed as %"\
  1.2592 -          "of CompileThreshold) before (re-)compiling OSR code")            \
  1.2593 +          "NON_TIERED number of method invocations/branches (expressed as " \
  1.2594 +          "% of CompileThreshold) before (re-)compiling OSR code")          \
  1.2595                                                                              \
  1.2596    product(intx, InterpreterProfilePercentage, 33,                           \
  1.2597 -          "NON_TIERED number of method invocations/branches (expressed as %"\
  1.2598 -          "of CompileThreshold) before profiling in the interpreter")       \
  1.2599 +          "NON_TIERED number of method invocations/branches (expressed as " \
  1.2600 +          "% of CompileThreshold) before profiling in the interpreter")     \
  1.2601                                                                              \
  1.2602    develop(intx, MaxRecompilationSearchLength,    10,                        \
  1.2603 -          "max. # frames to inspect searching for recompilee")              \
  1.2604 +          "The maximum number of frames to inspect when searching for "     \
  1.2605 +          "recompilee")                                                     \
  1.2606                                                                              \
  1.2607    develop(intx, MaxInterpretedSearchLength,     3,                          \
  1.2608 -          "max. # interp. frames to skip when searching for recompilee")    \
  1.2609 +          "The maximum number of interpreted frames to skip when searching "\
  1.2610 +          "for recompilee")                                                 \
  1.2611                                                                              \
  1.2612    develop(intx, DesiredMethodLimit,  8000,                                  \
  1.2613 -          "desired max. method size (in bytecodes) after inlining")         \
  1.2614 +          "The desired maximum method size (in bytecodes) after inlining")  \
  1.2615                                                                              \
  1.2616    develop(intx, HugeMethodLimit,  8000,                                     \
  1.2617 -          "don't compile methods larger than this if "                      \
  1.2618 +          "Don't compile methods larger than this if "                      \
  1.2619            "+DontCompileHugeMethods")                                        \
  1.2620                                                                              \
  1.2621    /* New JDK 1.4 reflection implementation */                               \
  1.2622 @@ -3534,6 +3642,8 @@
  1.2623            "Temporary flag for transition to AbstractMethodError wrapped "   \
  1.2624            "in InvocationTargetException. See 6531596")                      \
  1.2625                                                                              \
  1.2626 +  develop(bool, VerifyLambdaBytecodes, false,                               \
  1.2627 +          "Force verification of jdk 8 lambda metafactory bytecodes")       \
  1.2628                                                                              \
  1.2629    develop(intx, FastSuperclassLimit, 8,                                     \
  1.2630            "Depth of hardwired instanceof accelerator array")                \
  1.2631 @@ -3557,18 +3667,19 @@
  1.2632    /* flags for performance data collection */                               \
  1.2633                                                                              \
  1.2634    product(bool, UsePerfData, falseInEmbedded,                               \
  1.2635 -          "Flag to disable jvmstat instrumentation for performance testing" \
  1.2636 -          "and problem isolation purposes.")                                \
  1.2637 +          "Flag to disable jvmstat instrumentation for performance testing "\
  1.2638 +          "and problem isolation purposes")                                 \
  1.2639                                                                              \
  1.2640    product(bool, PerfDataSaveToFile, false,                                  \
  1.2641            "Save PerfData memory to hsperfdata_<pid> file on exit")          \
  1.2642                                                                              \
  1.2643    product(ccstr, PerfDataSaveFile, NULL,                                    \
  1.2644 -          "Save PerfData memory to the specified absolute pathname,"        \
  1.2645 -           "%p in the file name if present will be replaced by pid")        \
  1.2646 -                                                                            \
  1.2647 -  product(intx, PerfDataSamplingInterval, 50 /*ms*/,                        \
  1.2648 -          "Data sampling interval in milliseconds")                         \
  1.2649 +          "Save PerfData memory to the specified absolute pathname. "       \
  1.2650 +          "The string %p in the file name (if present) "                    \
  1.2651 +          "will be replaced by pid")                                        \
  1.2652 +                                                                            \
  1.2653 +  product(intx, PerfDataSamplingInterval, 50,                               \
  1.2654 +          "Data sampling interval (in milliseconds)")                       \
  1.2655                                                                              \
  1.2656    develop(bool, PerfTraceDataCreation, false,                               \
  1.2657            "Trace creation of Performance Data Entries")                     \
  1.2658 @@ -3593,7 +3704,7 @@
  1.2659            "Bypass Win32 file system criteria checks (Windows Only)")        \
  1.2660                                                                              \
  1.2661    product(intx, UnguardOnExecutionViolation, 0,                             \
  1.2662 -          "Unguard page and retry on no-execute fault (Win32 only)"         \
  1.2663 +          "Unguard page and retry on no-execute fault (Win32 only) "        \
  1.2664            "0=off, 1=conservative, 2=aggressive")                            \
  1.2665                                                                              \
  1.2666    /* Serviceability Support */                                              \
  1.2667 @@ -3602,7 +3713,7 @@
  1.2668            "Create JMX Management Server")                                   \
  1.2669                                                                              \
  1.2670    product(bool, DisableAttachMechanism, false,                              \
  1.2671 -         "Disable mechanism that allows tools to attach to this VM")        \
  1.2672 +          "Disable mechanism that allows tools to attach to this VM")       \
  1.2673                                                                              \
  1.2674    product(bool, StartAttachListener, false,                                 \
  1.2675            "Always start Attach Listener at VM startup")                     \
  1.2676 @@ -3625,9 +3736,9 @@
  1.2677            "Require shared spaces for metadata")                             \
  1.2678                                                                              \
  1.2679    product(bool, DumpSharedSpaces, false,                                    \
  1.2680 -           "Special mode: JVM reads a class list, loads classes, builds "   \
  1.2681 -            "shared spaces, and dumps the shared spaces to a file to be "   \
  1.2682 -            "used in future JVM runs.")                                     \
  1.2683 +          "Special mode: JVM reads a class list, loads classes, builds "    \
  1.2684 +          "shared spaces, and dumps the shared spaces to a file to be "     \
  1.2685 +          "used in future JVM runs")                                        \
  1.2686                                                                              \
  1.2687    product(bool, PrintSharedSpaces, false,                                   \
  1.2688            "Print usage of shared spaces")                                   \
  1.2689 @@ -3667,6 +3778,9 @@
  1.2690    experimental(bool, TrustFinalNonStaticFields, false,                      \
  1.2691            "trust final non-static declarations for constant folding")       \
  1.2692                                                                              \
  1.2693 +  experimental(bool, FoldStableValues, false,                               \
  1.2694 +          "Private flag to control optimizations for stable variables")     \
  1.2695 +                                                                            \
  1.2696    develop(bool, TraceInvokeDynamic, false,                                  \
  1.2697            "trace internal invoke dynamic operations")                       \
  1.2698                                                                              \
  1.2699 @@ -3697,27 +3811,24 @@
  1.2700            "Relax the access control checks in the verifier")                \
  1.2701                                                                              \
  1.2702    diagnostic(bool, PrintDTraceDOF, false,                                   \
  1.2703 -             "Print the DTrace DOF passed to the system for JSDT probes")   \
  1.2704 +          "Print the DTrace DOF passed to the system for JSDT probes")      \
  1.2705                                                                              \
  1.2706    product(uintx, StringTableSize, defaultStringTableSize,                   \
  1.2707            "Number of buckets in the interned String table")                 \
  1.2708                                                                              \
  1.2709 +  experimental(uintx, SymbolTableSize, defaultSymbolTableSize,              \
  1.2710 +          "Number of buckets in the JVM internal Symbol table")             \
  1.2711 +                                                                            \
  1.2712    develop(bool, TraceDefaultMethods, false,                                 \
  1.2713            "Trace the default method processing steps")                      \
  1.2714                                                                              \
  1.2715 -  develop(bool, ParseAllGenericSignatures, false,                           \
  1.2716 -          "Parse all generic signatures while classloading")                \
  1.2717 -                                                                            \
  1.2718    develop(bool, VerifyGenericSignatures, false,                             \
  1.2719            "Abort VM on erroneous or inconsistent generic signatures")       \
  1.2720                                                                              \
  1.2721 -  product(bool, ParseGenericDefaults, false,                                \
  1.2722 -          "Parse generic signatures for default method handling")           \
  1.2723 -                                                                            \
  1.2724    product(bool, UseVMInterruptibleIO, false,                                \
  1.2725            "(Unstable, Solaris-specific) Thread interrupt before or with "   \
  1.2726 -          "EINTR for I/O operations results in OS_INTRPT. The default value"\
  1.2727 -          " of this flag is true for JDK 6 and earlier")                    \
  1.2728 +          "EINTR for I/O operations results in OS_INTRPT. The default "     \
  1.2729 +          "value of this flag is true for JDK 6 and earlier")               \
  1.2730                                                                              \
  1.2731    diagnostic(bool, WhiteBoxAPI, false,                                      \
  1.2732            "Enable internal testing APIs")                                   \
  1.2733 @@ -3738,29 +3849,29 @@
  1.2734                                                                              \
  1.2735    product(bool, EnableTracing, false,                                       \
  1.2736            "Enable event-based tracing")                                     \
  1.2737 +                                                                            \
  1.2738    product(bool, UseLockedTracing, false,                                    \
  1.2739            "Use locked-tracing when doing event-based tracing")
  1.2740  
  1.2741 -
  1.2742  /*
  1.2743   *  Macros for factoring of globals
  1.2744   */
  1.2745  
  1.2746  // Interface macros
  1.2747 -#define DECLARE_PRODUCT_FLAG(type, name, value, doc)    extern "C" type name;
  1.2748 -#define DECLARE_PD_PRODUCT_FLAG(type, name, doc)        extern "C" type name;
  1.2749 -#define DECLARE_DIAGNOSTIC_FLAG(type, name, value, doc) extern "C" type name;
  1.2750 +#define DECLARE_PRODUCT_FLAG(type, name, value, doc)      extern "C" type name;
  1.2751 +#define DECLARE_PD_PRODUCT_FLAG(type, name, doc)          extern "C" type name;
  1.2752 +#define DECLARE_DIAGNOSTIC_FLAG(type, name, value, doc)   extern "C" type name;
  1.2753  #define DECLARE_EXPERIMENTAL_FLAG(type, name, value, doc) extern "C" type name;
  1.2754 -#define DECLARE_MANAGEABLE_FLAG(type, name, value, doc) extern "C" type name;
  1.2755 -#define DECLARE_PRODUCT_RW_FLAG(type, name, value, doc) extern "C" type name;
  1.2756 +#define DECLARE_MANAGEABLE_FLAG(type, name, value, doc)   extern "C" type name;
  1.2757 +#define DECLARE_PRODUCT_RW_FLAG(type, name, value, doc)   extern "C" type name;
  1.2758  #ifdef PRODUCT
  1.2759 -#define DECLARE_DEVELOPER_FLAG(type, name, value, doc)  const type name = value;
  1.2760 -#define DECLARE_PD_DEVELOPER_FLAG(type, name, doc)      const type name = pd_##name;
  1.2761 -#define DECLARE_NOTPRODUCT_FLAG(type, name, value, doc)
  1.2762 +#define DECLARE_DEVELOPER_FLAG(type, name, value, doc)    extern "C" type CONST_##name; const type name = value;
  1.2763 +#define DECLARE_PD_DEVELOPER_FLAG(type, name, doc)        extern "C" type CONST_##name; const type name = pd_##name;
  1.2764 +#define DECLARE_NOTPRODUCT_FLAG(type, name, value, doc)   extern "C" type CONST_##name;
  1.2765  #else
  1.2766 -#define DECLARE_DEVELOPER_FLAG(type, name, value, doc)  extern "C" type name;
  1.2767 -#define DECLARE_PD_DEVELOPER_FLAG(type, name, doc)      extern "C" type name;
  1.2768 -#define DECLARE_NOTPRODUCT_FLAG(type, name, value, doc)  extern "C" type name;
  1.2769 +#define DECLARE_DEVELOPER_FLAG(type, name, value, doc)    extern "C" type name;
  1.2770 +#define DECLARE_PD_DEVELOPER_FLAG(type, name, doc)        extern "C" type name;
  1.2771 +#define DECLARE_NOTPRODUCT_FLAG(type, name, value, doc)   extern "C" type name;
  1.2772  #endif
  1.2773  // Special LP64 flags, product only needed for now.
  1.2774  #ifdef _LP64
  1.2775 @@ -3770,23 +3881,23 @@
  1.2776  #endif // _LP64
  1.2777  
  1.2778  // Implementation macros
  1.2779 -#define MATERIALIZE_PRODUCT_FLAG(type, name, value, doc)   type name = value;
  1.2780 -#define MATERIALIZE_PD_PRODUCT_FLAG(type, name, doc)       type name = pd_##name;
  1.2781 -#define MATERIALIZE_DIAGNOSTIC_FLAG(type, name, value, doc) type name = value;
  1.2782 +#define MATERIALIZE_PRODUCT_FLAG(type, name, value, doc)      type name = value;
  1.2783 +#define MATERIALIZE_PD_PRODUCT_FLAG(type, name, doc)          type name = pd_##name;
  1.2784 +#define MATERIALIZE_DIAGNOSTIC_FLAG(type, name, value, doc)   type name = value;
  1.2785  #define MATERIALIZE_EXPERIMENTAL_FLAG(type, name, value, doc) type name = value;
  1.2786 -#define MATERIALIZE_MANAGEABLE_FLAG(type, name, value, doc) type name = value;
  1.2787 -#define MATERIALIZE_PRODUCT_RW_FLAG(type, name, value, doc) type name = value;
  1.2788 +#define MATERIALIZE_MANAGEABLE_FLAG(type, name, value, doc)   type name = value;
  1.2789 +#define MATERIALIZE_PRODUCT_RW_FLAG(type, name, value, doc)   type name = value;
  1.2790  #ifdef PRODUCT
  1.2791 -#define MATERIALIZE_DEVELOPER_FLAG(type, name, value, doc) /* flag name is constant */
  1.2792 -#define MATERIALIZE_PD_DEVELOPER_FLAG(type, name, doc)     /* flag name is constant */
  1.2793 -#define MATERIALIZE_NOTPRODUCT_FLAG(type, name, value, doc)
  1.2794 +#define MATERIALIZE_DEVELOPER_FLAG(type, name, value, doc)    type CONST_##name = value;
  1.2795 +#define MATERIALIZE_PD_DEVELOPER_FLAG(type, name, doc)        type CONST_##name = pd_##name;
  1.2796 +#define MATERIALIZE_NOTPRODUCT_FLAG(type, name, value, doc)   type CONST_##name = value;
  1.2797  #else
  1.2798 -#define MATERIALIZE_DEVELOPER_FLAG(type, name, value, doc) type name = value;
  1.2799 -#define MATERIALIZE_PD_DEVELOPER_FLAG(type, name, doc)     type name = pd_##name;
  1.2800 -#define MATERIALIZE_NOTPRODUCT_FLAG(type, name, value, doc) type name = value;
  1.2801 +#define MATERIALIZE_DEVELOPER_FLAG(type, name, value, doc)    type name = value;
  1.2802 +#define MATERIALIZE_PD_DEVELOPER_FLAG(type, name, doc)        type name = pd_##name;
  1.2803 +#define MATERIALIZE_NOTPRODUCT_FLAG(type, name, value, doc)   type name = value;
  1.2804  #endif
  1.2805  #ifdef _LP64
  1.2806 -#define MATERIALIZE_LP64_PRODUCT_FLAG(type, name, value, doc)   type name = value;
  1.2807 +#define MATERIALIZE_LP64_PRODUCT_FLAG(type, name, value, doc) type name = value;
  1.2808  #else
  1.2809  #define MATERIALIZE_LP64_PRODUCT_FLAG(type, name, value, doc) /* flag is constant */
  1.2810  #endif // _LP64

mercurial