comparison src/share/vm/runtime/arguments.hpp @ 4559:723df37192d6

Make it possible again to build a real client libjvm, drop the UseGraal flag. Use the --vm option instead of a special -vm option in the bench command
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 10 Feb 2012 17:04:03 +0100
parents 4aa80ca3dbec
children d4e039a3e083
comparison
equal deleted inserted replaced
4558:3706975946e4 4559:723df37192d6
243 static SystemProperty *_sun_boot_library_path; 243 static SystemProperty *_sun_boot_library_path;
244 static SystemProperty *_java_library_path; 244 static SystemProperty *_java_library_path;
245 static SystemProperty *_java_home; 245 static SystemProperty *_java_home;
246 static SystemProperty *_java_class_path; 246 static SystemProperty *_java_class_path;
247 static SystemProperty *_sun_boot_class_path; 247 static SystemProperty *_sun_boot_class_path;
248 #ifdef GRAAL
248 static SystemProperty *_compiler_class_path; 249 static SystemProperty *_compiler_class_path;
250 #endif
249 251
250 // Meta-index for knowing what packages are in the boot class path 252 // Meta-index for knowing what packages are in the boot class path
251 static char* _meta_index_path; 253 static char* _meta_index_path;
252 static char* _meta_index_dir; 254 static char* _meta_index_dir;
253 255
368 uintx min_size); 370 uintx min_size);
369 371
370 // methods to build strings from individual args 372 // methods to build strings from individual args
371 static void build_jvm_args(const char* arg); 373 static void build_jvm_args(const char* arg);
372 static void build_jvm_flags(const char* arg); 374 static void build_jvm_flags(const char* arg);
375 #ifdef GRAAL
373 static void add_graal_arg(const char* arg); 376 static void add_graal_arg(const char* arg);
377 #endif
374 static void add_string(char*** bldarray, int* count, const char* arg); 378 static void add_string(char*** bldarray, int* count, const char* arg);
375 static const char* build_resource_string(char** args, int count); 379 static const char* build_resource_string(char** args, int count);
376 380
377 static bool methodExists( 381 static bool methodExists(
378 char* className, char* methodName, 382 char* className, char* methodName,
424 static bool process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized); 428 static bool process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized);
425 429
426 // return a char* array containing all options 430 // return a char* array containing all options
427 static char** jvm_flags_array() { return _jvm_flags_array; } 431 static char** jvm_flags_array() { return _jvm_flags_array; }
428 static char** jvm_args_array() { return _jvm_args_array; } 432 static char** jvm_args_array() { return _jvm_args_array; }
433 #ifdef GRAAL
429 static char** graal_args_array() { return _graal_args_array; } 434 static char** graal_args_array() { return _graal_args_array; }
435 #endif
430 static int num_jvm_flags() { return _num_jvm_flags; } 436 static int num_jvm_flags() { return _num_jvm_flags; }
431 static int num_graal_args() { return _num_graal_args; } 437 static int num_graal_args() { return _num_graal_args; }
432 static int num_jvm_args() { return _num_jvm_args; } 438 static int num_jvm_args() { return _num_jvm_args; }
433 // return the arguments passed to the Java application 439 // return the arguments passed to the Java application
434 static const char* java_command() { return _java_command; } 440 static const char* java_command() { return _java_command; }
524 static void set_java_home(char *value) { _java_home->set_value(value); } 530 static void set_java_home(char *value) { _java_home->set_value(value); }
525 static void set_library_path(char *value) { _java_library_path->set_value(value); } 531 static void set_library_path(char *value) { _java_library_path->set_value(value); }
526 static void set_ext_dirs(char *value) { _java_ext_dirs->set_value(value); } 532 static void set_ext_dirs(char *value) { _java_ext_dirs->set_value(value); }
527 static void set_endorsed_dirs(char *value) { _java_endorsed_dirs->set_value(value); } 533 static void set_endorsed_dirs(char *value) { _java_endorsed_dirs->set_value(value); }
528 static void set_sysclasspath(char *value) { _sun_boot_class_path->set_value(value); } 534 static void set_sysclasspath(char *value) { _sun_boot_class_path->set_value(value); }
535 #ifdef GRAAL
529 static void set_compilerclasspath(char *value) { _compiler_class_path->set_value(value); } 536 static void set_compilerclasspath(char *value) { _compiler_class_path->set_value(value); }
537 #endif
530 static void append_sysclasspath(const char *value) { _sun_boot_class_path->append_value(value); } 538 static void append_sysclasspath(const char *value) { _sun_boot_class_path->append_value(value); }
531 static void set_meta_index_path(char* meta_index_path, char* meta_index_dir) { 539 static void set_meta_index_path(char* meta_index_path, char* meta_index_dir) {
532 _meta_index_path = meta_index_path; 540 _meta_index_path = meta_index_path;
533 _meta_index_dir = meta_index_dir; 541 _meta_index_dir = meta_index_dir;
534 } 542 }
535 543
536 static char *get_java_home() { return _java_home->value(); } 544 static char *get_java_home() { return _java_home->value(); }
537 static char *get_dll_dir() { return _sun_boot_library_path->value(); } 545 static char *get_dll_dir() { return _sun_boot_library_path->value(); }
538 static char *get_endorsed_dir() { return _java_endorsed_dirs->value(); } 546 static char *get_endorsed_dir() { return _java_endorsed_dirs->value(); }
539 static char *get_sysclasspath() { return _sun_boot_class_path->value(); } 547 static char *get_sysclasspath() { return _sun_boot_class_path->value(); }
548 #ifdef GRAAL
540 static char *get_compilerclasspath() { return _compiler_class_path->value(); } 549 static char *get_compilerclasspath() { return _compiler_class_path->value(); }
550 #endif
541 static char* get_meta_index_path() { return _meta_index_path; } 551 static char* get_meta_index_path() { return _meta_index_path; }
542 static char* get_meta_index_dir() { return _meta_index_dir; } 552 static char* get_meta_index_dir() { return _meta_index_dir; }
543 553
544 // Operation modi 554 // Operation modi
545 static Mode mode() { return _mode; } 555 static Mode mode() { return _mode; }