Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 2891:75a99b4f1c98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rebranded C++ part from C1X to Graal.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Wed, 08 Jun 2011 14:01:51 +0200
parents 810e2d253e00
children d577d07cedec
comparison
equal deleted inserted replaced
2890:c23d45daff9b 2891:75a99b4f1c98
65 65
66 char** Arguments::_jvm_flags_array = NULL; 66 char** Arguments::_jvm_flags_array = NULL;
67 int Arguments::_num_jvm_flags = 0; 67 int Arguments::_num_jvm_flags = 0;
68 char** Arguments::_jvm_args_array = NULL; 68 char** Arguments::_jvm_args_array = NULL;
69 int Arguments::_num_jvm_args = 0; 69 int Arguments::_num_jvm_args = 0;
70 char** Arguments::_c1x_args_array = NULL; 70 char** Arguments::_graal_args_array = NULL;
71 int Arguments::_num_c1x_args = 0; 71 int Arguments::_num_graal_args = 0;
72 char* Arguments::_java_command = NULL; 72 char* Arguments::_java_command = NULL;
73 SystemProperty* Arguments::_system_properties = NULL; 73 SystemProperty* Arguments::_system_properties = NULL;
74 const char* Arguments::_gc_log_filename = NULL; 74 const char* Arguments::_gc_log_filename = NULL;
75 bool Arguments::_has_profile = false; 75 bool Arguments::_has_profile = false;
76 bool Arguments::_has_alloc_profile = false; 76 bool Arguments::_has_alloc_profile = false;
747 747
748 void Arguments::build_jvm_flags(const char* arg) { 748 void Arguments::build_jvm_flags(const char* arg) {
749 add_string(&_jvm_flags_array, &_num_jvm_flags, arg); 749 add_string(&_jvm_flags_array, &_num_jvm_flags, arg);
750 } 750 }
751 751
752 void Arguments::add_c1x_arg(const char* arg) { 752 void Arguments::add_graal_arg(const char* arg) {
753 add_string(&_c1x_args_array, &_num_c1x_args, arg); 753 add_string(&_graal_args_array, &_num_graal_args, arg);
754 } 754 }
755 755
756 // utility function to return a string that concatenates all 756 // utility function to return a string that concatenates all
757 // strings in a given char** array 757 // strings in a given char** array
758 const char* Arguments::build_resource_string(char** args, int count) { 758 const char* Arguments::build_resource_string(char** args, int count) {
2666 } 2666 }
2667 } else if (match_option(option, "-graal", &tail)) { 2667 } else if (match_option(option, "-graal", &tail)) {
2668 if (PrintVMOptions) { 2668 if (PrintVMOptions) {
2669 tty->print("Running Graal VM... "); 2669 tty->print("Running Graal VM... ");
2670 } 2670 }
2671 UseC1X = true; 2671 UseGraal = true;
2672 BootstrapC1X = true; 2672 Bootstrapgraal = true;
2673 const int BUFFER_SIZE = 1024; 2673 const int BUFFER_SIZE = 1024;
2674 char maxine_dir[BUFFER_SIZE]; 2674 char maxine_dir[BUFFER_SIZE];
2675 char graal_dir[BUFFER_SIZE]; 2675 char graal_dir[BUFFER_SIZE];
2676 char temp[BUFFER_SIZE]; 2676 char temp[BUFFER_SIZE];
2677 if (!os::getenv("MAXINE", maxine_dir, sizeof(maxine_dir))) { 2677 if (!os::getenv("MAXINE", maxine_dir, sizeof(maxine_dir))) {
2697 sprintf(temp, "%s/graal/com.oracle.max.graal.graph/bin", graal_dir); 2697 sprintf(temp, "%s/graal/com.oracle.max.graal.graph/bin", graal_dir);
2698 scp_p->add_prefix(temp); 2698 scp_p->add_prefix(temp);
2699 sprintf(temp, "%s/graal/com.oracle.max.graal.graphviz/bin", graal_dir); 2699 sprintf(temp, "%s/graal/com.oracle.max.graal.graphviz/bin", graal_dir);
2700 scp_p->add_prefix(temp); 2700 scp_p->add_prefix(temp);
2701 *scp_assembly_required_p = true; 2701 *scp_assembly_required_p = true;
2702 } else if (match_option(option, "-C1X:", &tail)) { // -C1X:xxxx 2702 } else if (match_option(option, "-G:", &tail)) { // -graal:xxxx
2703 // Option for the C1X compiler. 2703 // Option for the graal compiler.
2704 if (PrintVMOptions) { 2704 if (PrintVMOptions) {
2705 tty->print_cr("C1X option %s", tail); 2705 tty->print_cr("graal option %s", tail);
2706 } 2706 }
2707 Arguments::add_c1x_arg(tail); 2707 Arguments::add_graal_arg(tail);
2708 2708
2709 // Unknown option 2709 // Unknown option
2710 } else if (is_bad_option(option, args->ignoreUnrecognized)) { 2710 } else if (is_bad_option(option, args->ignoreUnrecognized)) {
2711 return JNI_ERR; 2711 return JNI_ERR;
2712 } 2712 }