Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 12840:aa6f2ea19d8f
Merge
author | jcoomes |
---|---|
date | Fri, 11 Oct 2013 08:27:21 -0700 |
parents | c90e76575b03 85c1ca43713f |
children | 027006a47a6d |
comparison
equal
deleted
inserted
replaced
12829:c01f4910f5f5 | 12840:aa6f2ea19d8f |
---|---|
2655 // -Xbatch | 2655 // -Xbatch |
2656 } else if (match_option(option, "-Xbatch", &tail)) { | 2656 } else if (match_option(option, "-Xbatch", &tail)) { |
2657 FLAG_SET_CMDLINE(bool, BackgroundCompilation, false); | 2657 FLAG_SET_CMDLINE(bool, BackgroundCompilation, false); |
2658 // -Xmn for compatibility with other JVM vendors | 2658 // -Xmn for compatibility with other JVM vendors |
2659 } else if (match_option(option, "-Xmn", &tail)) { | 2659 } else if (match_option(option, "-Xmn", &tail)) { |
2660 julong long_initial_eden_size = 0; | 2660 julong long_initial_young_size = 0; |
2661 ArgsRange errcode = parse_memory_size(tail, &long_initial_eden_size, 1); | 2661 ArgsRange errcode = parse_memory_size(tail, &long_initial_young_size, 1); |
2662 if (errcode != arg_in_range) { | 2662 if (errcode != arg_in_range) { |
2663 jio_fprintf(defaultStream::error_stream(), | 2663 jio_fprintf(defaultStream::error_stream(), |
2664 "Invalid initial eden size: %s\n", option->optionString); | 2664 "Invalid initial young generation size: %s\n", option->optionString); |
2665 describe_range_error(errcode); | 2665 describe_range_error(errcode); |
2666 return JNI_EINVAL; | 2666 return JNI_EINVAL; |
2667 } | 2667 } |
2668 FLAG_SET_CMDLINE(uintx, MaxNewSize, (uintx)long_initial_eden_size); | 2668 FLAG_SET_CMDLINE(uintx, MaxNewSize, (uintx)long_initial_young_size); |
2669 FLAG_SET_CMDLINE(uintx, NewSize, (uintx)long_initial_eden_size); | 2669 FLAG_SET_CMDLINE(uintx, NewSize, (uintx)long_initial_young_size); |
2670 // -Xms | 2670 // -Xms |
2671 } else if (match_option(option, "-Xms", &tail)) { | 2671 } else if (match_option(option, "-Xms", &tail)) { |
2672 julong long_initial_heap_size = 0; | 2672 julong long_initial_heap_size = 0; |
2673 // an initial heap size of 0 means automatically determine | 2673 // an initial heap size of 0 means automatically determine |
2674 ArgsRange errcode = parse_memory_size(tail, &long_initial_heap_size, 0); | 2674 ArgsRange errcode = parse_memory_size(tail, &long_initial_heap_size, 0); |
3664 } | 3664 } |
3665 #else // INCLUDE_ALL_GCS | 3665 #else // INCLUDE_ALL_GCS |
3666 assert(verify_serial_gc_flags(), "SerialGC unset"); | 3666 assert(verify_serial_gc_flags(), "SerialGC unset"); |
3667 #endif // INCLUDE_ALL_GCS | 3667 #endif // INCLUDE_ALL_GCS |
3668 | 3668 |
3669 // Initialize Metaspace flags and alignments. | |
3670 Metaspace::ergo_initialize(); | |
3671 | |
3669 // Set bytecode rewriting flags | 3672 // Set bytecode rewriting flags |
3670 set_bytecode_flags(); | 3673 set_bytecode_flags(); |
3671 | 3674 |
3672 // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled. | 3675 // Set flags if Aggressive optimization flags (-XX:+AggressiveOpts) enabled. |
3673 set_aggressive_opts_flags(); | 3676 set_aggressive_opts_flags(); |