Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 7125:1baf7f1e3f23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
decoupled C++ Graal runtime from C1
author Doug Simon <doug.simon@oracle.com>
date Mon, 03 Dec 2012 15:32:17 +0100
parents 7d815d842ee0
children 5d0bb7d52783
comparison
equal deleted inserted replaced
7124:ab65fa23f8e9 7125:1baf7f1e3f23
1513 } 1513 }
1514 } 1514 }
1515 1515
1516 void Arguments::set_g1_gc_flags() { 1516 void Arguments::set_g1_gc_flags() {
1517 assert(UseG1GC, "Error"); 1517 assert(UseG1GC, "Error");
1518 #ifdef COMPILER1 1518 #if defined(COMPILER1) || defined(GRAAL)
1519 FastTLABRefill = false; 1519 FastTLABRefill = false;
1520 #endif 1520 #endif
1521 FLAG_SET_DEFAULT(ParallelGCThreads, 1521 FLAG_SET_DEFAULT(ParallelGCThreads,
1522 Abstract_VM_Version::parallel_worker_threads()); 1522 Abstract_VM_Version::parallel_worker_threads());
1523 if (ParallelGCThreads == 0) { 1523 if (ParallelGCThreads == 0) {
2032 #ifdef GRAAL 2032 #ifdef GRAAL
2033 if (UseCompressedOops) { 2033 if (UseCompressedOops) {
2034 jio_fprintf(defaultStream::error_stream(), 2034 jio_fprintf(defaultStream::error_stream(),
2035 "CompressedOops are not supported in Graal at the moment\n"); 2035 "CompressedOops are not supported in Graal at the moment\n");
2036 status = false; 2036 status = false;
2037 } 2037 } else {
2038 // This prevents the flag being set to true by set_ergonomics_flags()
2039 FLAG_SET_CMDLINE(bool, UseCompressedOops, false);
2040 }
2041
2038 if (UseCompressedKlassPointers) { 2042 if (UseCompressedKlassPointers) {
2039 jio_fprintf(defaultStream::error_stream(), 2043 jio_fprintf(defaultStream::error_stream(),
2040 "UseCompressedKlassPointers are not supported in Graal at the moment\n"); 2044 "UseCompressedKlassPointers are not supported in Graal at the moment\n");
2041 status = false; 2045 status = false;
2046 } else {
2047 // This prevents the flag being set to true by set_ergonomics_flags()
2048 FLAG_SET_CMDLINE(bool, UseCompressedKlassPointers, false);
2042 } 2049 }
2043 if (UseG1GC) { 2050 if (UseG1GC) {
2044 jio_fprintf(defaultStream::error_stream(), 2051 jio_fprintf(defaultStream::error_stream(),
2045 "G1 is not supported in Graal at the moment\n"); 2052 "G1 is not supported in Graal at the moment\n");
2046 status = false; 2053 status = false;
2054 } else {
2055 // This prevents the flag being set to true by set_ergonomics_flags()
2056 FLAG_SET_CMDLINE(bool, UseG1GC, false);
2047 } 2057 }
2048 2058
2049 if (!ScavengeRootsInCode) { 2059 if (!ScavengeRootsInCode) {
2050 warning("forcing ScavengeRootsInCode non-zero because Graal is enabled"); 2060 warning("forcing ScavengeRootsInCode non-zero because Graal is enabled");
2051 ScavengeRootsInCode = 1; 2061 ScavengeRootsInCode = 1;
2955 } 2965 }
2956 } 2966 }
2957 } 2967 }
2958 #ifdef GRAAL 2968 #ifdef GRAAL
2959 else if (match_option(option, "-G:", &tail)) { // -G:XXX 2969 else if (match_option(option, "-G:", &tail)) { // -G:XXX
2960 // Option for the graal compiler. 2970 // Option for the Graal compiler.
2961 if (PrintVMOptions) { 2971 if (PrintVMOptions) {
2962 tty->print_cr("graal option %s", tail); 2972 tty->print_cr("Graal option %s", tail);
2963 } 2973 }
2964 Arguments::add_graal_arg(tail); 2974 Arguments::add_graal_arg(tail);
2965 2975
2966 // Unknown option 2976 // Unknown option
2967 } 2977 }
3430 3440
3431 // Turn off biased locking for locking debug mode flags, 3441 // Turn off biased locking for locking debug mode flags,
3432 // which are subtlely different from each other but neither works with 3442 // which are subtlely different from each other but neither works with
3433 // biased locking. 3443 // biased locking.
3434 if (UseHeavyMonitors 3444 if (UseHeavyMonitors
3435 #ifdef COMPILER1 3445 #if defined(COMPILER1) || defined(GRAAL)
3436 || !UseFastLocking 3446 || !UseFastLocking
3437 #endif // COMPILER1 3447 #endif // COMPILER1
3438 ) { 3448 ) {
3439 if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) { 3449 if (!FLAG_IS_DEFAULT(UseBiasedLocking) && UseBiasedLocking) {
3440 // flag set to true on command line; warn the user that they 3450 // flag set to true on command line; warn the user that they