Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/arguments.cpp @ 12039:3cce976666d9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge hs25-b46
author Gilles Duboscq <duboscq@ssw.jku.at>
date Thu, 10 Oct 2013 14:20:04 +0200
parents f49ee75d2a8b 5e0b3d7df485
children 58fc8e2b7b6d
comparison
equal deleted inserted replaced
11958:a0f5be106e67 12039:3cce976666d9
57 #endif // INCLUDE_ALL_GCS 57 #endif // INCLUDE_ALL_GCS
58 58
59 // Note: This is a special bug reporting site for the JVM 59 // Note: This is a special bug reporting site for the JVM
60 #define DEFAULT_VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/crash.jsp" 60 #define DEFAULT_VENDOR_URL_BUG "http://bugreport.sun.com/bugreport/crash.jsp"
61 #define DEFAULT_JAVA_LAUNCHER "generic" 61 #define DEFAULT_JAVA_LAUNCHER "generic"
62
63 // Disable options not supported in this release, with a warning if they
64 // were explicitly requested on the command-line
65 #define UNSUPPORTED_OPTION(opt, description) \
66 do { \
67 if (opt) { \
68 if (FLAG_IS_CMDLINE(opt)) { \
69 warning(description " is disabled in this release."); \
70 } \
71 FLAG_SET_DEFAULT(opt, false); \
72 } \
73 } while(0)
74
75 #define UNSUPPORTED_GC_OPTION(gc) \
76 do { \
77 if (gc) { \
78 if (FLAG_IS_CMDLINE(gc)) { \
79 warning(#gc " is not supported in this VM. Using Serial GC."); \
80 } \
81 FLAG_SET_DEFAULT(gc, false); \
82 } \
83 } while(0)
62 84
63 char** Arguments::_jvm_flags_array = NULL; 85 char** Arguments::_jvm_flags_array = NULL;
64 int Arguments::_num_jvm_flags = 0; 86 int Arguments::_num_jvm_flags = 0;
65 char** Arguments::_jvm_args_array = NULL; 87 char** Arguments::_jvm_args_array = NULL;
66 int Arguments::_num_jvm_args = 0; 88 int Arguments::_num_jvm_args = 0;
1898 void Arguments::check_deprecated_gc_flags() { 1920 void Arguments::check_deprecated_gc_flags() {
1899 if (FLAG_IS_CMDLINE(MaxGCMinorPauseMillis)) { 1921 if (FLAG_IS_CMDLINE(MaxGCMinorPauseMillis)) {
1900 warning("Using MaxGCMinorPauseMillis as minor pause goal is deprecated" 1922 warning("Using MaxGCMinorPauseMillis as minor pause goal is deprecated"
1901 "and will likely be removed in future release"); 1923 "and will likely be removed in future release");
1902 } 1924 }
1925 if (FLAG_IS_CMDLINE(DefaultMaxRAMFraction)) {
1926 warning("DefaultMaxRAMFraction is deprecated and will likely be removed in a future release. "
1927 "Use MaxRAMFraction instead.");
1928 }
1903 } 1929 }
1904 1930
1905 // Check stack pages settings 1931 // Check stack pages settings
1906 bool Arguments::check_stack_pages() 1932 bool Arguments::check_stack_pages()
1907 { 1933 {
3160 // Note that large pages are enabled/disabled for both the 3186 // Note that large pages are enabled/disabled for both the
3161 // Java heap and the code cache. 3187 // Java heap and the code cache.
3162 FLAG_SET_DEFAULT(UseLargePages, false); 3188 FLAG_SET_DEFAULT(UseLargePages, false);
3163 } 3189 }
3164 3190
3165 // Tiered compilation is undefined with C1.
3166 TieredCompilation = false;
3167 #else 3191 #else
3168 if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) { 3192 if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) {
3169 FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1); 3193 FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1);
3170 } 3194 }
3195 #endif
3196
3197 #ifndef TIERED
3198 // Tiered compilation is undefined.
3199 UNSUPPORTED_OPTION(TieredCompilation, "TieredCompilation");
3171 #endif 3200 #endif
3172 3201
3173 // If we are running in a headless jre, force java.awt.headless property 3202 // If we are running in a headless jre, force java.awt.headless property
3174 // to be true unless the property has already been set. 3203 // to be true unless the property has already been set.
3175 // Also allow the OS environment variable JAVA_AWT_HEADLESS to set headless state. 3204 // Also allow the OS environment variable JAVA_AWT_HEADLESS to set headless state.
3310 } 3339 }
3311 UseSharedSpaces = false; 3340 UseSharedSpaces = false;
3312 } 3341 }
3313 } 3342 }
3314 3343
3315 // Disable options not supported in this release, with a warning if they
3316 // were explicitly requested on the command-line
3317 #define UNSUPPORTED_OPTION(opt, description) \
3318 do { \
3319 if (opt) { \
3320 if (FLAG_IS_CMDLINE(opt)) { \
3321 warning(description " is disabled in this release."); \
3322 } \
3323 FLAG_SET_DEFAULT(opt, false); \
3324 } \
3325 } while(0)
3326
3327
3328 #define UNSUPPORTED_GC_OPTION(gc) \
3329 do { \
3330 if (gc) { \
3331 if (FLAG_IS_CMDLINE(gc)) { \
3332 warning(#gc " is not supported in this VM. Using Serial GC."); \
3333 } \
3334 FLAG_SET_DEFAULT(gc, false); \
3335 } \
3336 } while(0)
3337
3338 #if !INCLUDE_ALL_GCS 3344 #if !INCLUDE_ALL_GCS
3339 static void force_serial_gc() { 3345 static void force_serial_gc() {
3340 FLAG_SET_DEFAULT(UseSerialGC, true); 3346 FLAG_SET_DEFAULT(UseSerialGC, true);
3341 FLAG_SET_DEFAULT(CMSIncrementalMode, false); // special CMS suboption 3347 FLAG_SET_DEFAULT(CMSIncrementalMode, false); // special CMS suboption
3342 UNSUPPORTED_GC_OPTION(UseG1GC); 3348 UNSUPPORTED_GC_OPTION(UseG1GC);