Mercurial > hg > graal-jvmci-8

comparison src/share/vm/runtime/arguments.cpp @ 22398:4f6caa445b92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved JVMCI option parsing back into Java
author Doug Simon <doug.simon@oracle.com>
date Tue, 04 Aug 2015 00:47:34 +0200
parents c28cb37b2e1d
children 4a532b03e2cd
comparison
equal deleted inserted replaced
22397:7202e96981c6 22398:4f6caa445b92
96 96
97 char** Arguments::_jvm_flags_array = NULL; 97 char** Arguments::_jvm_flags_array = NULL;
98 int Arguments::_num_jvm_flags = 0; 98 int Arguments::_num_jvm_flags = 0;
99 char** Arguments::_jvm_args_array = NULL; 99 char** Arguments::_jvm_args_array = NULL;
100 int Arguments::_num_jvm_args = 0; 100 int Arguments::_num_jvm_args = 0;
101 #if INCLUDE_JVMCI
102 char** Arguments::_jvmci_args_array = NULL;
103 int Arguments::_num_jvmci_args = 0;
104 #endif
105 char* Arguments::_java_command = NULL; 101 char* Arguments::_java_command = NULL;
106 SystemProperty* Arguments::_system_properties = NULL; 102 SystemProperty* Arguments::_system_properties = NULL;
107 const char* Arguments::_gc_log_filename = NULL; 103 const char* Arguments::_gc_log_filename = NULL;
108 bool Arguments::_has_profile = false; 104 bool Arguments::_has_profile = false;
109 size_t Arguments::_conservative_max_heap_alignment = 0; 105 size_t Arguments::_conservative_max_heap_alignment = 0;
815 } 811 }
816 812
817 void Arguments::build_jvm_flags(const char* arg) { 813 void Arguments::build_jvm_flags(const char* arg) {
818 add_string(&_jvm_flags_array, &_num_jvm_flags, arg); 814 add_string(&_jvm_flags_array, &_num_jvm_flags, arg);
819 } 815 }
820 #if INCLUDE_JVMCI
821 void Arguments::add_jvmci_arg(const char* arg) {
822 add_string(&_jvmci_args_array, &_num_jvmci_args, arg);
823 }
824 #endif
825 816
826 // utility function to return a string that concatenates all 817 // utility function to return a string that concatenates all
827 // strings in a given char** array 818 // strings in a given char** array
828 const char* Arguments::build_resource_string(char** args, int count) { 819 const char* Arguments::build_resource_string(char** args, int count) {
829 if (args == NULL || count == 0) { 820 if (args == NULL || count == 0) {
3387 if (!process_argument(tail, args->ignoreUnrecognized, origin)) { 3378 if (!process_argument(tail, args->ignoreUnrecognized, origin)) {
3388 return JNI_EINVAL; 3379 return JNI_EINVAL;
3389 } 3380 }
3390 } 3381 }
3391 } 3382 }
3392 #if INCLUDE_JVMCI
3393 else if (match_option(option, "-G:", &tail)) { // -G:XXX
3394 // Option for the JVMCI compiler.
3395 if (PrintVMOptions) {
3396 tty->print_cr("JVMCI option %s", tail);
3397 }
3398 Arguments::add_jvmci_arg(tail);
3399
3400 // Unknown option
3401 }
3402 #endif
3403 else if (is_bad_option(option, args->ignoreUnrecognized)) { 3383 else if (is_bad_option(option, args->ignoreUnrecognized)) {
3404 return JNI_ERR; 3384 return JNI_ERR;
3405 } 3385 }
3406 } 3386 }
3407 3387