Mercurial > hg > graal-jvmci-8
diff src/share/vm/jvmci/jvmciRuntime.cpp @ 21875:431b127fc0d1
Renaming of classes around jvmciOptions for clarity
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Tue, 09 Jun 2015 13:06:37 +0200 |
parents | 9966b358bc2b |
children | d358434dd6b7 |
line wrap: on
line diff
--- a/src/share/vm/jvmci/jvmciRuntime.cpp Tue Jun 09 12:49:55 2015 +0200 +++ b/src/share/vm/jvmci/jvmciRuntime.cpp Tue Jun 09 13:06:37 2015 +0200 @@ -729,13 +729,13 @@ } } -OptionsValueTable* JVMCIRuntime::parse_arguments() { - OptionsTable* table = OptionsTable::load_options(); +OptionValuesTable* JVMCIRuntime::parse_arguments() { + OptionDescsTable* table = OptionDescsTable::load_options(); if (table == NULL) { return NULL; } - OptionsValueTable* options = new OptionsValueTable(table); + OptionValuesTable* options = new OptionValuesTable(table); // Process option overrides from jvmci.options first parse_jvmci_options_file(options); @@ -752,7 +752,7 @@ return options; } -void not_found(OptionsTable* table, const char* argname, size_t namelen) { +void not_found(OptionDescsTable* table, const char* argname, size_t namelen) { jio_fprintf(defaultStream::error_stream(),"Unrecognized VM option '%.*s'\n", namelen, argname); OptionDesc* fuzzy_matched = table->fuzzy_match(argname, strlen(argname)); if (fuzzy_matched != NULL) { @@ -764,8 +764,8 @@ } } -bool JVMCIRuntime::parse_argument(OptionsValueTable* options, const char* arg) { - OptionsTable* table = options->options_table(); +bool JVMCIRuntime::parse_argument(OptionValuesTable* options, const char* arg) { + OptionDescsTable* table = options->options_table(); char first = arg[0]; const char* name; size_t name_len; @@ -862,9 +862,9 @@ } class JVMCIOptionParseClosure : public ParseClosure { - OptionsValueTable* _options; + OptionValuesTable* _options; public: - JVMCIOptionParseClosure(OptionsValueTable* options) : _options(options) {} + JVMCIOptionParseClosure(OptionValuesTable* options) : _options(options) {} void do_line(char* line) { if (!JVMCIRuntime::parse_argument(_options, line)) { warn("There was an error parsing an argument. Skipping it."); @@ -872,7 +872,7 @@ } }; -void JVMCIRuntime::parse_jvmci_options_file(OptionsValueTable* options) { +void JVMCIRuntime::parse_jvmci_options_file(OptionValuesTable* options) { const char* home = Arguments::get_java_home(); size_t path_len = strlen(home) + strlen("/lib/jvmci.options") + 1; char path[JVM_MAXPATHLEN]; @@ -1010,7 +1010,7 @@ } }; -void JVMCIRuntime::set_options(OptionsValueTable* options, TRAPS) { +void JVMCIRuntime::set_options(OptionValuesTable* options, TRAPS) { ensure_jvmci_class_loader_is_initialized(); { ResourceMark rm;