Mercurial > hg > graal-compiler
diff src/share/vm/compiler/compilerOracle.cpp @ 20430:119875f0fc67
8056964: JDK-8055286 changes are incomplete.
Summary: added ccstr and ccstrlist types to compilerOracle 'option' command
Reviewed-by: roland
author | kvn |
---|---|
date | Tue, 02 Sep 2014 10:26:48 -0700 |
parents | 14b356bbca27 |
children | e09c0676c53f |
line wrap: on
line diff
--- a/src/share/vm/compiler/compilerOracle.cpp Fri Aug 29 15:32:16 2014 +0200 +++ b/src/share/vm/compiler/compilerOracle.cpp Tue Sep 02 10:26:48 2014 -0700 @@ -172,7 +172,6 @@ UintxType, BoolType, CcstrType, - CcstrListType, UnknownType }; @@ -194,6 +193,19 @@ return BoolType; } +template<> OptionType get_type_for<ccstr>() { + return CcstrType; +} + +template<typename T> +static const T copy_value(const T value) { + return value; +} + +template<> const ccstr copy_value<ccstr>(const ccstr value) { + return (const ccstr)strdup(value); +} + template <typename T> class TypedMethodOptionMatcher : public MethodMatcher { const char* _option; @@ -206,7 +218,7 @@ Symbol* signature, const char* opt, const T value, MethodMatcher* next) : MethodMatcher(class_name, class_mode, method_name, method_mode, signature, next), - _type(get_type_for<T>()), _value(value) { + _type(get_type_for<T>()), _value(copy_value<T>(value)) { _option = strdup(opt); } @@ -252,8 +264,8 @@ void TypedMethodOptionMatcher<intx>::print() { ttyLocker ttyl; print_base(); - tty->print(" %s", _option); - tty->print(" " INTX_FORMAT, _value); + tty->print(" intx %s", _option); + tty->print(" = " INTX_FORMAT, _value); tty->cr(); }; @@ -261,8 +273,8 @@ void TypedMethodOptionMatcher<uintx>::print() { ttyLocker ttyl; print_base(); - tty->print(" %s", _option); - tty->print(" " UINTX_FORMAT, _value); + tty->print(" uintx %s", _option); + tty->print(" = " UINTX_FORMAT, _value); tty->cr(); }; @@ -270,8 +282,17 @@ void TypedMethodOptionMatcher<bool>::print() { ttyLocker ttyl; print_base(); - tty->print(" %s", _option); - tty->print(" %s", _value ? "true" : "false"); + tty->print(" bool %s", _option); + tty->print(" = %s", _value ? "true" : "false"); + tty->cr(); +}; + +template<> +void TypedMethodOptionMatcher<ccstr>::print() { + ttyLocker ttyl; + print_base(); + tty->print(" const char* %s", _option); + tty->print(" = '%s'", _value); tty->cr(); }; @@ -367,6 +388,7 @@ template bool CompilerOracle::has_option_value<intx>(methodHandle method, const char* option, intx& value); template bool CompilerOracle::has_option_value<uintx>(methodHandle method, const char* option, uintx& value); template bool CompilerOracle::has_option_value<bool>(methodHandle method, const char* option, bool& value); +template bool CompilerOracle::has_option_value<ccstr>(methodHandle method, const char* option, ccstr& value); bool CompilerOracle::should_exclude(methodHandle method, bool& quietly) { quietly = true; @@ -558,12 +580,45 @@ } else { jio_snprintf(errorbuf, buf_size, " Value cannot be read for flag %s of type %s", flag, type); } + } else if (strcmp(type, "ccstr") == 0) { + ResourceMark rm; + char* value = NEW_RESOURCE_ARRAY(char, strlen(line) + 1); + if (sscanf(line, "%*[ \t]%255[_a-zA-Z0-9]%n", value, &bytes_read) == 1) { + total_bytes_read += bytes_read; + return add_option_string(c_name, c_match, m_name, m_match, signature, flag, (ccstr)value); + } else { + jio_snprintf(errorbuf, buf_size, " Value cannot be read for flag %s of type %s", flag, type); + } + } else if (strcmp(type, "ccstrlist") == 0) { + // Accumulates several strings into one. The internal type is ccstr. + ResourceMark rm; + char* value = NEW_RESOURCE_ARRAY(char, strlen(line) + 1); + char* next_value = value; + if (sscanf(line, "%*[ \t]%255[_a-zA-Z0-9]%n", next_value, &bytes_read) == 1) { + total_bytes_read += bytes_read; + line += bytes_read; + next_value += bytes_read; + char* end_value = next_value-1; + while (sscanf(line, "%*[ \t]%255[_a-zA-Z0-9]%n", next_value, &bytes_read) == 1) { + total_bytes_read += bytes_read; + line += bytes_read; + *end_value = ' '; // override '\0' + next_value += bytes_read; + end_value = next_value-1; + } + return add_option_string(c_name, c_match, m_name, m_match, signature, flag, (ccstr)value); + } else { + jio_snprintf(errorbuf, buf_size, " Value cannot be read for flag %s of type %s", flag, type); + } } else if (strcmp(type, "bool") == 0) { char value[256]; if (sscanf(line, "%*[ \t]%255[a-zA-Z]%n", value, &bytes_read) == 1) { if (strcmp(value, "true") == 0) { total_bytes_read += bytes_read; return add_option_string(c_name, c_match, m_name, m_match, signature, flag, true); + } else if (strcmp(value, "false") == 0) { + total_bytes_read += bytes_read; + return add_option_string(c_name, c_match, m_name, m_match, signature, flag, false); } else { jio_snprintf(errorbuf, buf_size, " Value cannot be read for flag %s of type %s", flag, type); } @@ -664,8 +719,7 @@ // (i.e., to check if a flag "someflag" is enabled for a method). // // Type (2) is used to support options with a value. Values can have the - // the following types: intx, uintx, bool, ccstr, and ccstrlist. Currently, - // values of type intx, uintx, and bool are supported. + // the following types: intx, uintx, bool, ccstr, and ccstrlist. // // For future extensions: extend scan_flag_and_value() char option[256]; // stores flag for Type (1) and type of Type (2)