src/hotspot/share/runtime/arguments.cpp

*** 39,51 ****
  #include "memory/filemap.hpp"
  #include "oops/oop.inline.hpp"
  #include "prims/jvmtiExport.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/flags/jvmFlag.hpp"
- #include "runtime/flags/jvmFlagConstraintList.hpp"
- #include "runtime/flags/jvmFlagRangeList.hpp"
- #include "runtime/globals_extension.hpp"
  #include "runtime/java.hpp"
  #include "runtime/os.inline.hpp"
  #include "runtime/safepoint.hpp"
  #include "runtime/safepointMechanism.hpp"
  #include "runtime/vm_version.hpp"
--- 39,48 ----
*** 852,862 ****
      ShouldNotReachHere();
    }
  }
  
  static bool set_bool_flag(JVMFlag* flag, bool value, JVMFlag::Flags origin) {
!   if (JVMFlag::boolAtPut(flag, &value, origin) == JVMFlag::SUCCESS) {
      return true;
    } else {
      return false;
    }
  }
--- 849,859 ----
      ShouldNotReachHere();
    }
  }
  
  static bool set_bool_flag(JVMFlag* flag, bool value, JVMFlag::Flags origin) {
!   if (JVMFlag::boolAtPut(flag, value, origin) == JVMFlag::SUCCESS) {
      return true;
    } else {
      return false;
    }
  }
*** 867,877 ****
    double v = strtod(value, &end);
    if ((errno != 0) || (*end != 0)) {
      return false;
    }
  
!   if (JVMFlag::doubleAtPut(flag, &v, origin) == JVMFlag::SUCCESS) {
      return true;
    }
    return false;
  }
  
--- 864,874 ----
    double v = strtod(value, &end);
    if ((errno != 0) || (*end != 0)) {
      return false;
    }
  
!   if (JVMFlag::doubleAtPut(flag, v, origin) == JVMFlag::SUCCESS) {
      return true;
    }
    return false;
  }
  
*** 899,930 ****
    if (flag->is_int()) {
      int_v = (int) v;
      if (is_neg) {
        int_v = -int_v;
      }
!     return JVMFlag::intAtPut(flag, &int_v, origin) == JVMFlag::SUCCESS;
    } else if (flag->is_uint()) {
      uint uint_v = (uint) v;
!     return JVMFlag::uintAtPut(flag, &uint_v, origin) == JVMFlag::SUCCESS;
    } else if (flag->is_intx()) {
      intx_v = (intx) v;
      if (is_neg) {
        intx_v = -intx_v;
      }
!     return JVMFlag::intxAtPut(flag, &intx_v, origin) == JVMFlag::SUCCESS;
    } else if (flag->is_uintx()) {
      uintx uintx_v = (uintx) v;
!     return JVMFlag::uintxAtPut(flag, &uintx_v, origin) == JVMFlag::SUCCESS;
    } else if (flag->is_uint64_t()) {
      uint64_t uint64_t_v = (uint64_t) v;
!     return JVMFlag::uint64_tAtPut(flag, &uint64_t_v, origin) == JVMFlag::SUCCESS;
    } else if (flag->is_size_t()) {
      size_t size_t_v = (size_t) v;
!     return JVMFlag::size_tAtPut(flag, &size_t_v, origin) == JVMFlag::SUCCESS;
    } else if (flag->is_double()) {
      double double_v = (double) v;
!     return JVMFlag::doubleAtPut(flag, &double_v, origin) == JVMFlag::SUCCESS;
    } else {
      return false;
    }
  }
  
--- 896,927 ----
    if (flag->is_int()) {
      int_v = (int) v;
      if (is_neg) {
        int_v = -int_v;
      }
!     return JVMFlag::intAtPut(flag, int_v, origin) == JVMFlag::SUCCESS;
    } else if (flag->is_uint()) {
      uint uint_v = (uint) v;
!     return JVMFlag::uintAtPut(flag, uint_v, origin) == JVMFlag::SUCCESS;
    } else if (flag->is_intx()) {
      intx_v = (intx) v;
      if (is_neg) {
        intx_v = -intx_v;
      }
!     return JVMFlag::intxAtPut(flag, intx_v, origin) == JVMFlag::SUCCESS;
    } else if (flag->is_uintx()) {
      uintx uintx_v = (uintx) v;
!     return JVMFlag::uintxAtPut(flag, uintx_v, origin) == JVMFlag::SUCCESS;
    } else if (flag->is_uint64_t()) {
      uint64_t uint64_t_v = (uint64_t) v;
!     return JVMFlag::uint64_tAtPut(flag, uint64_t_v, origin) == JVMFlag::SUCCESS;
    } else if (flag->is_size_t()) {
      size_t size_t_v = (size_t) v;
!     return JVMFlag::size_tAtPut(flag, size_t_v, origin) == JVMFlag::SUCCESS;
    } else if (flag->is_double()) {
      double double_v = (double) v;
!     return JVMFlag::doubleAtPut(flag, double_v, origin) == JVMFlag::SUCCESS;
    } else {
      return false;
    }
  }
  
*** 1330,1340 ****
      JVMFlag* fuzzy_matched = JVMFlag::fuzzy_match((const char*)argname, arg_len, true);
      if (fuzzy_matched != NULL) {
        jio_fprintf(defaultStream::error_stream(),
                    "Did you mean '%s%s%s'? ",
                    (fuzzy_matched->is_bool()) ? "(+/-)" : "",
!                   fuzzy_matched->_name,
                    (fuzzy_matched->is_bool()) ? "" : "=<value>");
      }
    }
  
    // allow for commandline "commenting out" options like -XX:#+Verbose
--- 1327,1337 ----
      JVMFlag* fuzzy_matched = JVMFlag::fuzzy_match((const char*)argname, arg_len, true);
      if (fuzzy_matched != NULL) {
        jio_fprintf(defaultStream::error_stream(),
                    "Did you mean '%s%s%s'? ",
                    (fuzzy_matched->is_bool()) ? "(+/-)" : "",
!                   fuzzy_matched->name(),
                    (fuzzy_matched->is_bool()) ? "" : "=<value>");
      }
    }
  
    // allow for commandline "commenting out" options like -XX:#+Verbose
*** 3851,3864 ****
  // Parse entry point called from JNI_CreateJavaVM
  
  jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
    assert(verify_special_jvm_flags(false), "deprecated and obsolete flag table inconsistent");
  
-   // Initialize ranges and constraints
-   JVMFlagRangeList::init();
-   JVMFlagConstraintList::init();
- 
    // If flag "-XX:Flags=flags-file" is used it will be the first option to be processed.
    const char* hotspotrc = ".hotspotrc";
    bool settings_file_specified = false;
    bool needs_hotspotrc_warning = false;
    ScopedVMInitArgs initial_vm_options_args("");
--- 3848,3857 ----