Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 3797:eb94b7226b7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7061192: option handling adjustments for oracle and embedded builds Reviewed-by: dholmes, never, jwilhelm, kvn
author jcoomes
date Wed, 06 Jul 2011 12:17:44 -0700
parents ef2d1b8f2dd4
children 8a4fc2990229
comparison
equal deleted inserted replaced
3796:7d9e451f5416 3797:eb94b7226b7a
249 { "UseParallelDensePrefixUpdate", 249 { "UseParallelDensePrefixUpdate",
250 JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) }, 250 JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) },
251 { "UseParallelOldGCDensePrefix", 251 { "UseParallelOldGCDensePrefix",
252 JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) }, 252 JDK_Version::jdk_update(6,27), JDK_Version::jdk(8) },
253 { "AllowTransitionalJSR292", JDK_Version::jdk(7), JDK_Version::jdk(8) }, 253 { "AllowTransitionalJSR292", JDK_Version::jdk(7), JDK_Version::jdk(8) },
254 { "UseCompressedStrings", JDK_Version::jdk(7), JDK_Version::jdk(8) },
255 #ifdef PRODUCT
256 { "DesiredMethodLimit",
257 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) },
258 #endif // PRODUCT
254 { NULL, JDK_Version(0), JDK_Version(0) } 259 { NULL, JDK_Version(0), JDK_Version(0) }
255 }; 260 };
256 261
257 // Returns true if the flag is obsolete and fits into the range specified 262 // Returns true if the flag is obsolete and fits into the range specified
258 // for being ignored. In the case that the flag is ignored, the 'version' 263 // for being ignored. In the case that the flag is ignored, the 'version'
2910 // there may not even be a shared archive to use. 2915 // there may not even be a shared archive to use.
2911 FLAG_SET_DEFAULT(UseLargePages, false); 2916 FLAG_SET_DEFAULT(UseLargePages, false);
2912 } 2917 }
2913 } 2918 }
2914 2919
2920 // Disable options not supported in this release, with a warning if they
2921 // were explicitly requested on the command-line
2922 #define UNSUPPORTED_OPTION(opt, description) \
2923 do { \
2924 if (opt) { \
2925 if (FLAG_IS_CMDLINE(opt)) { \
2926 warning(description " is disabled in this release."); \
2927 } \
2928 FLAG_SET_DEFAULT(opt, false); \
2929 } \
2930 } while(0)
2931
2915 // Parse entry point called from JNI_CreateJavaVM 2932 // Parse entry point called from JNI_CreateJavaVM
2916 2933
2917 jint Arguments::parse(const JavaVMInitArgs* args) { 2934 jint Arguments::parse(const JavaVMInitArgs* args) {
2918 2935
2919 // Sharing support 2936 // Sharing support
3006 // Parse JavaVMInitArgs structure passed in, as well as JAVA_TOOL_OPTIONS and _JAVA_OPTIONS 3023 // Parse JavaVMInitArgs structure passed in, as well as JAVA_TOOL_OPTIONS and _JAVA_OPTIONS
3007 jint result = parse_vm_init_args(args); 3024 jint result = parse_vm_init_args(args);
3008 if (result != JNI_OK) { 3025 if (result != JNI_OK) {
3009 return result; 3026 return result;
3010 } 3027 }
3028
3029 #ifdef JAVASE_EMBEDDED
3030 #ifdef PPC
3031 UNSUPPORTED_OPTION(EnableInvokeDynamic, "Invoke dynamic");
3032 #endif
3033 UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
3034 #endif
3011 3035
3012 #ifndef PRODUCT 3036 #ifndef PRODUCT
3013 if (TraceBytecodesAt != 0) { 3037 if (TraceBytecodesAt != 0) {
3014 TraceBytecodes = true; 3038 TraceBytecodes = true;
3015 } 3039 }