src/hotspot/share/runtime/flags/jvmFlagRangeList.cpp

*** 33,54 ****
  #include "runtime/flags/jvmFlagConstraintList.hpp"
  #include "runtime/flags/jvmFlagRangeList.hpp"
  #include "runtime/globals_extension.hpp"
  #include "runtime/os.hpp"
  #include "runtime/task.hpp"
- #include "utilities/defaultStream.hpp"
  #include "utilities/macros.hpp"
  
- void CommandLineError::print(bool verbose, const char* msg, ...) {
-   if (verbose) {
-     va_list listPointer;
-     va_start(listPointer, msg);
-     jio_vfprintf(defaultStream::error_stream(), msg, listPointer);
-     va_end(listPointer);
-   }
- }
- 
  class JVMFlagRange_int : public JVMFlagRange {
    int _min;
    int _max;
    const int* _ptr;
  
--- 33,44 ----
*** 61,71 ****
      return check_int(*_ptr, verbose);
    }
  
    JVMFlag::Error check_int(int value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       CommandLineError::print(verbose,
                                "int %s=%d is outside the allowed range "
                                "[ %d ... %d ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
--- 51,61 ----
      return check_int(*_ptr, verbose);
    }
  
    JVMFlag::Error check_int(int value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       JVMFlag::printError(verbose,
                                "int %s=%d is outside the allowed range "
                                "[ %d ... %d ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
*** 91,101 ****
      return check_intx(*_ptr, verbose);
    }
  
    JVMFlag::Error check_intx(intx value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       CommandLineError::print(verbose,
                                "intx %s=" INTX_FORMAT " is outside the allowed range "
                                "[ " INTX_FORMAT " ... " INTX_FORMAT " ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
--- 81,91 ----
      return check_intx(*_ptr, verbose);
    }
  
    JVMFlag::Error check_intx(intx value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       JVMFlag::printError(verbose,
                                "intx %s=" INTX_FORMAT " is outside the allowed range "
                                "[ " INTX_FORMAT " ... " INTX_FORMAT " ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
*** 122,132 ****
      return check_uint(*_ptr, verbose);
    }
  
    JVMFlag::Error check_uint(uint value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       CommandLineError::print(verbose,
                                "uint %s=%u is outside the allowed range "
                                "[ %u ... %u ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
--- 112,122 ----
      return check_uint(*_ptr, verbose);
    }
  
    JVMFlag::Error check_uint(uint value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       JVMFlag::printError(verbose,
                                "uint %s=%u is outside the allowed range "
                                "[ %u ... %u ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
*** 153,163 ****
      return check_uintx(*_ptr, verbose);
    }
  
    JVMFlag::Error check_uintx(uintx value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       CommandLineError::print(verbose,
                                "uintx %s=" UINTX_FORMAT " is outside the allowed range "
                                "[ " UINTX_FORMAT " ... " UINTX_FORMAT " ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
--- 143,153 ----
      return check_uintx(*_ptr, verbose);
    }
  
    JVMFlag::Error check_uintx(uintx value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       JVMFlag::printError(verbose,
                                "uintx %s=" UINTX_FORMAT " is outside the allowed range "
                                "[ " UINTX_FORMAT " ... " UINTX_FORMAT " ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
*** 184,194 ****
      return check_uint64_t(*_ptr, verbose);
    }
  
    JVMFlag::Error check_uint64_t(uint64_t value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       CommandLineError::print(verbose,
                                "uint64_t %s=" UINT64_FORMAT " is outside the allowed range "
                                "[ " UINT64_FORMAT " ... " UINT64_FORMAT " ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
--- 174,184 ----
      return check_uint64_t(*_ptr, verbose);
    }
  
    JVMFlag::Error check_uint64_t(uint64_t value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       JVMFlag::printError(verbose,
                                "uint64_t %s=" UINT64_FORMAT " is outside the allowed range "
                                "[ " UINT64_FORMAT " ... " UINT64_FORMAT " ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
*** 215,225 ****
      return check_size_t(*_ptr, verbose);
    }
  
    JVMFlag::Error check_size_t(size_t value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       CommandLineError::print(verbose,
                                "size_t %s=" SIZE_FORMAT " is outside the allowed range "
                                "[ " SIZE_FORMAT " ... " SIZE_FORMAT " ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
--- 205,215 ----
      return check_size_t(*_ptr, verbose);
    }
  
    JVMFlag::Error check_size_t(size_t value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       JVMFlag::printError(verbose,
                                "size_t %s=" SIZE_FORMAT " is outside the allowed range "
                                "[ " SIZE_FORMAT " ... " SIZE_FORMAT " ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
*** 246,256 ****
      return check_double(*_ptr, verbose);
    }
  
    JVMFlag::Error check_double(double value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       CommandLineError::print(verbose,
                                "double %s=%f is outside the allowed range "
                                "[ %f ... %f ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
--- 236,246 ----
      return check_double(*_ptr, verbose);
    }
  
    JVMFlag::Error check_double(double value, bool verbose = true) {
      if ((value < _min) || (value > _max)) {
!       JVMFlag::printError(verbose,
                                "double %s=%f is outside the allowed range "
                                "[ %f ... %f ]\n",
                                name(), value, _min, _max);
        return JVMFlag::OUT_OF_BOUNDS;
      } else {
*** 430,440 ****
      }
    }
  }
  
  bool JVMFlagRangeList::check_ranges() {
-   // Check ranges.
    bool status = true;
    for (int i=0; i<length(); i++) {
      JVMFlagRange* range = at(i);
      if (range->check(true) != JVMFlag::SUCCESS) status = false;
    }
--- 420,429 ----