Mercurial > hg > truffle

comparison src/share/vm/runtime/arguments.cpp @ 3736:d3ec27ea1b20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Work with GRAAL environment variable instead of MAXINE environment variable.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Sat, 17 Dec 2011 20:48:46 +0100
parents 3822c5969a8b
children 04b9a2566eec
comparison
equal deleted inserted replaced
3735:61369a06f03c 3736:d3ec27ea1b20
2019 if (UseGraal) { 2019 if (UseGraal) {
2020 if (PrintVMOptions) { 2020 if (PrintVMOptions) {
2021 tty->print_cr("Running Graal VM... "); 2021 tty->print_cr("Running Graal VM... ");
2022 } 2022 }
2023 const int BUFFER_SIZE = 1024; 2023 const int BUFFER_SIZE = 1024;
2024 char maxine_dir[BUFFER_SIZE]; 2024 char graal_dir[BUFFER_SIZE];
2025 char temp[BUFFER_SIZE]; 2025 char temp[BUFFER_SIZE];
2026 if (!os::getenv("MAXINE", maxine_dir, sizeof(maxine_dir))) { 2026 if (!os::getenv("GRAAL", graal_dir, sizeof(graal_dir))) {
2027 jio_fprintf(defaultStream::output_stream(), "Error while starting Graal VM: The MAXINE environment variable needs to point to a Maxine repository.\n"); 2027 jio_fprintf(defaultStream::output_stream(), "Error while starting Graal VM: The GRAAL environment variable needs to point to the directory containing the Graal projects.\n");
2028 vm_exit(0); 2028 vm_exit(0);
2029 } 2029 }
2030 if (PrintVMOptions) tty->print_cr("MAXINE=%s", maxine_dir); 2030 if (PrintVMOptions) tty->print_cr("GRAAL=%s", graal_dir);
2031 SysClassPath scp_compiler(Arguments::get_sysclasspath()); 2031 SysClassPath scp_compiler(Arguments::get_sysclasspath());
2032 sprintf(temp, "%s/com.oracle.max.cri/bin", maxine_dir); 2032 sprintf(temp, "%s/com.oracle.max.cri/bin", graal_dir);
2033 scp_compiler.add_prefix(temp); 2033 scp_compiler.add_prefix(temp);
2034 sprintf(temp, "%s/com.oracle.max.criutils/bin", maxine_dir); 2034 sprintf(temp, "%s/com.oracle.max.criutils/bin", graal_dir);
2035 scp_compiler.add_prefix(temp); 2035 scp_compiler.add_prefix(temp);
2036 sprintf(temp, "%s/com.oracle.max.base/bin", maxine_dir); 2036 sprintf(temp, "%s/com.oracle.max.base/bin", graal_dir);
2037 scp_compiler.add_prefix(temp); 2037 scp_compiler.add_prefix(temp);
2038 sprintf(temp, "%s/com.oracle.max.asmdis/bin", maxine_dir); 2038 sprintf(temp, "%s/com.oracle.max.asmdis/bin", graal_dir);
2039 scp_compiler.add_prefix(temp); 2039 scp_compiler.add_prefix(temp);
2040 sprintf(temp, "%s/com.oracle.max.asm/bin", maxine_dir); 2040 sprintf(temp, "%s/com.oracle.max.asm/bin", graal_dir);
2041 scp_compiler.add_prefix(temp); 2041 scp_compiler.add_prefix(temp);
2042 sprintf(temp, "%s/com.oracle.max.graal.graph/bin", maxine_dir); 2042 sprintf(temp, "%s/com.oracle.max.graal.graph/bin", graal_dir);
2043 scp_compiler.add_prefix(temp); 2043 scp_compiler.add_prefix(temp);
2044 sprintf(temp, "%s/com.oracle.max.graal.compiler/bin", maxine_dir); 2044 sprintf(temp, "%s/com.oracle.max.graal.compiler/bin", graal_dir);
2045 scp_compiler.add_prefix(temp); 2045 scp_compiler.add_prefix(temp);
2046 sprintf(temp, "%s/com.oracle.max.graal.nodes/bin", maxine_dir); 2046 sprintf(temp, "%s/com.oracle.max.graal.nodes/bin", graal_dir);
2047 scp_compiler.add_prefix(temp); 2047 scp_compiler.add_prefix(temp);
2048 sprintf(temp, "%s/com.oracle.max.graal.snippets/bin", maxine_dir); 2048 sprintf(temp, "%s/com.oracle.max.graal.snippets/bin", graal_dir);
2049 scp_compiler.add_prefix(temp); 2049 scp_compiler.add_prefix(temp);
2050 sprintf(temp, "%s/com.oracle.max.graal.criutils/bin", maxine_dir); 2050 sprintf(temp, "%s/com.oracle.max.graal.criutils/bin", graal_dir);
2051 scp_compiler.add_prefix(temp); 2051 scp_compiler.add_prefix(temp);
2052 sprintf(temp, "%s/com.oracle.max.graal.extensions/bin", maxine_dir); 2052 sprintf(temp, "%s/com.oracle.max.graal.hotspot/bin", graal_dir);
2053 scp_compiler.add_prefix(temp);
2054 sprintf(temp, "%s/com.oracle.max.graal.hotspot/bin", maxine_dir);
2055 scp_compiler.add_prefix(temp);
2056 sprintf(temp, "%s/com.oracle.max.graal.graphviz/bin", maxine_dir);
2057 scp_compiler.add_prefix(temp); 2053 scp_compiler.add_prefix(temp);
2058 scp_compiler.expand_endorsed(); 2054 scp_compiler.expand_endorsed();
2059 Arguments::set_compilerclasspath(scp_compiler.combined_path()); 2055 Arguments::set_compilerclasspath(scp_compiler.combined_path());
2060 } 2056 }
2061 2057