Mercurial > hg > graal-compiler

comparison src/share/vm/runtime/arguments.cpp @ 11112:ec173c8f3739

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author roland
date Thu, 11 Jul 2013 01:11:52 -0700
parents fa6929d0b0a9 dec841e0c9aa
children 02d7aa1456c9
comparison
equal deleted inserted replaced
11105:22baec423e2f 11112:ec173c8f3739
258 { "MaxPermHeapExpansion", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 258 { "MaxPermHeapExpansion", JDK_Version::jdk(8), JDK_Version::jdk(9) },
259 { "CMSRevisitStackSize", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 259 { "CMSRevisitStackSize", JDK_Version::jdk(8), JDK_Version::jdk(9) },
260 { "PrintRevisitStats", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 260 { "PrintRevisitStats", JDK_Version::jdk(8), JDK_Version::jdk(9) },
261 { "UseVectoredExceptions", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 261 { "UseVectoredExceptions", JDK_Version::jdk(8), JDK_Version::jdk(9) },
262 { "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 262 { "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) },
263 { "UseISM", JDK_Version::jdk(8), JDK_Version::jdk(9) },
264 { "UsePermISM", JDK_Version::jdk(8), JDK_Version::jdk(9) },
265 { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) },
263 #ifdef PRODUCT 266 #ifdef PRODUCT
264 { "DesiredMethodLimit", 267 { "DesiredMethodLimit",
265 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, 268 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) },
266 #endif // PRODUCT 269 #endif // PRODUCT
267 { NULL, JDK_Version(0), JDK_Version(0) } 270 { NULL, JDK_Version(0), JDK_Version(0) }
1852 jio_fprintf(defaultStream::error_stream(), 1855 jio_fprintf(defaultStream::error_stream(),
1853 "Conflicting collector combinations in option list; " 1856 "Conflicting collector combinations in option list; "
1854 "please refer to the release notes for the combinations " 1857 "please refer to the release notes for the combinations "
1855 "allowed\n"); 1858 "allowed\n");
1856 status = false; 1859 status = false;
1857 } 1860 } else if (ReservedCodeCacheSize > 2*G) {
1858 1861 // Code cache size larger than MAXINT is not supported.
1862 jio_fprintf(defaultStream::error_stream(),
1863 "Invalid ReservedCodeCacheSize=%dM. Must be at most %uM.\n", ReservedCodeCacheSize/M,
1864 (2*G)/M);
1865 status = false;
1866 }
1859 return status; 1867 return status;
1860 } 1868 }
1861 1869
1862 void Arguments::check_deprecated_gcs() { 1870 void Arguments::check_deprecated_gcs() {
1863 if (UseConcMarkSweepGC && !UseParNewGC) { 1871 if (UseConcMarkSweepGC && !UseParNewGC) {
2219 } else if (ReservedCodeCacheSize < min_code_cache_size) { 2227 } else if (ReservedCodeCacheSize < min_code_cache_size) {
2220 jio_fprintf(defaultStream::error_stream(), 2228 jio_fprintf(defaultStream::error_stream(),
2221 "Invalid ReservedCodeCacheSize=%dK. Must be at least %uK.\n", ReservedCodeCacheSize/K, 2229 "Invalid ReservedCodeCacheSize=%dK. Must be at least %uK.\n", ReservedCodeCacheSize/K,
2222 min_code_cache_size/K); 2230 min_code_cache_size/K);
2223 status = false; 2231 status = false;
2224 } 2232 } else if (ReservedCodeCacheSize > 2*G) {
2225 2233 // Code cache size larger than MAXINT is not supported.
2234 jio_fprintf(defaultStream::error_stream(),
2235 "Invalid ReservedCodeCacheSize=%dM. Must be at most %uM.\n", ReservedCodeCacheSize/M,
2236 (2*G)/M);
2237 status = false;
2238 }
2226 return status; 2239 return status;
2227 } 2240 }
2228 2241
2229 bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore, 2242 bool Arguments::is_bad_option(const JavaVMOption* option, jboolean ignore,
2230 const char* option_type) { 2243 const char* option_type) {
2934 // No longer used. 2947 // No longer used.
2935 } else if (match_option(option, "-XX:+UseTLE", &tail)) { 2948 } else if (match_option(option, "-XX:+UseTLE", &tail)) {
2936 FLAG_SET_CMDLINE(bool, UseTLAB, true); 2949 FLAG_SET_CMDLINE(bool, UseTLAB, true);
2937 } else if (match_option(option, "-XX:-UseTLE", &tail)) { 2950 } else if (match_option(option, "-XX:-UseTLE", &tail)) {
2938 FLAG_SET_CMDLINE(bool, UseTLAB, false); 2951 FLAG_SET_CMDLINE(bool, UseTLAB, false);
2939 SOLARIS_ONLY(
2940 } else if (match_option(option, "-XX:+UsePermISM", &tail)) {
2941 warning("-XX:+UsePermISM is obsolete.");
2942 FLAG_SET_CMDLINE(bool, UseISM, true);
2943 } else if (match_option(option, "-XX:-UsePermISM", &tail)) {
2944 FLAG_SET_CMDLINE(bool, UseISM, false);
2945 )
2946 } else if (match_option(option, "-XX:+DisplayVMOutputToStderr", &tail)) { 2952 } else if (match_option(option, "-XX:+DisplayVMOutputToStderr", &tail)) {
2947 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, false); 2953 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStdout, false);
2948 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, true); 2954 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, true);
2949 } else if (match_option(option, "-XX:+DisplayVMOutputToStdout", &tail)) { 2955 } else if (match_option(option, "-XX:+DisplayVMOutputToStdout", &tail)) {
2950 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false); 2956 FLAG_SET_CMDLINE(bool, DisplayVMOutputToStderr, false);
3113 MaxHeapSize < LargePageHeapSizeThreshold) { 3119 MaxHeapSize < LargePageHeapSizeThreshold) {
3114 // No need for large granularity pages w/small heaps. 3120 // No need for large granularity pages w/small heaps.
3115 // Note that large pages are enabled/disabled for both the 3121 // Note that large pages are enabled/disabled for both the
3116 // Java heap and the code cache. 3122 // Java heap and the code cache.
3117 FLAG_SET_DEFAULT(UseLargePages, false); 3123 FLAG_SET_DEFAULT(UseLargePages, false);
3118 SOLARIS_ONLY(FLAG_SET_DEFAULT(UseMPSS, false));
3119 SOLARIS_ONLY(FLAG_SET_DEFAULT(UseISM, false));
3120 } 3124 }
3121 3125
3122 // Tiered compilation is undefined with C1. 3126 // Tiered compilation is undefined with C1.
3123 TieredCompilation = false; 3127 TieredCompilation = false;
3124 #else 3128 #else