Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 11999:79a5283f4595

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8021120: TieredCompilation can be enabled even if TIERED is undefined Reviewed-by: kvn, dholmes
author iignatyev
date Mon, 29 Jul 2013 11:54:18 +0400
parents 02d7aa1456c9
children 5e0b3d7df485
comparison
equal deleted inserted replaced
11962:d90d1b96b65b 11999:79a5283f4595
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;
3122 // Note that large pages are enabled/disabled for both the 3144 // Note that large pages are enabled/disabled for both the
3123 // Java heap and the code cache. 3145 // Java heap and the code cache.
3124 FLAG_SET_DEFAULT(UseLargePages, false); 3146 FLAG_SET_DEFAULT(UseLargePages, false);
3125 } 3147 }
3126 3148
3127 // Tiered compilation is undefined with C1.
3128 TieredCompilation = false;
3129 #else 3149 #else
3130 if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) { 3150 if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) {
3131 FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1); 3151 FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1);
3132 } 3152 }
3153 #endif
3154
3155 #ifndef TIERED
3156 // Tiered compilation is undefined.
3157 UNSUPPORTED_OPTION(TieredCompilation, "TieredCompilation");
3133 #endif 3158 #endif
3134 3159
3135 // If we are running in a headless jre, force java.awt.headless property 3160 // If we are running in a headless jre, force java.awt.headless property
3136 // to be true unless the property has already been set. 3161 // to be true unless the property has already been set.
3137 // Also allow the OS environment variable JAVA_AWT_HEADLESS to set headless state. 3162 // Also allow the OS environment variable JAVA_AWT_HEADLESS to set headless state.
3272 } 3297 }
3273 UseSharedSpaces = false; 3298 UseSharedSpaces = false;
3274 } 3299 }
3275 } 3300 }
3276 3301
3277 // Disable options not supported in this release, with a warning if they
3278 // were explicitly requested on the command-line
3279 #define UNSUPPORTED_OPTION(opt, description) \
3280 do { \
3281 if (opt) { \
3282 if (FLAG_IS_CMDLINE(opt)) { \
3283 warning(description " is disabled in this release."); \
3284 } \
3285 FLAG_SET_DEFAULT(opt, false); \
3286 } \
3287 } while(0)
3288
3289
3290 #define UNSUPPORTED_GC_OPTION(gc) \
3291 do { \
3292 if (gc) { \
3293 if (FLAG_IS_CMDLINE(gc)) { \
3294 warning(#gc " is not supported in this VM. Using Serial GC."); \
3295 } \
3296 FLAG_SET_DEFAULT(gc, false); \
3297 } \
3298 } while(0)
3299
3300 #if !INCLUDE_ALL_GCS 3302 #if !INCLUDE_ALL_GCS
3301 static void force_serial_gc() { 3303 static void force_serial_gc() {
3302 FLAG_SET_DEFAULT(UseSerialGC, true); 3304 FLAG_SET_DEFAULT(UseSerialGC, true);
3303 FLAG_SET_DEFAULT(CMSIncrementalMode, false); // special CMS suboption 3305 FLAG_SET_DEFAULT(CMSIncrementalMode, false); // special CMS suboption
3304 UNSUPPORTED_GC_OPTION(UseG1GC); 3306 UNSUPPORTED_GC_OPTION(UseG1GC);