src/hotspot/share/runtime/arguments.cpp

*** 2146,2161 ****
  #endif
  
    // Check lower bounds of the code cache
    // Template Interpreter code is approximately 3X larger in debug builds.
    uint min_code_cache_size = CodeCacheMinimumUseSpace DEBUG_ONLY(* 3);
!   if (InitialCodeCacheSize < (uintx)os::vm_page_size()) {
!     jio_fprintf(defaultStream::error_stream(),
!                 "Invalid InitialCodeCacheSize=%dK. Must be at least %dK.\n", InitialCodeCacheSize/K,
!                 os::vm_page_size()/K);
!     status = false;
!   } else if (ReservedCodeCacheSize < InitialCodeCacheSize) {
      jio_fprintf(defaultStream::error_stream(),
                  "Invalid ReservedCodeCacheSize: %dK. Must be at least InitialCodeCacheSize=%dK.\n",
                  ReservedCodeCacheSize/K, InitialCodeCacheSize/K);
      status = false;
    } else if (ReservedCodeCacheSize < min_code_cache_size) {
--- 2146,2156 ----
  #endif
  
    // Check lower bounds of the code cache
    // Template Interpreter code is approximately 3X larger in debug builds.
    uint min_code_cache_size = CodeCacheMinimumUseSpace DEBUG_ONLY(* 3);
!   if (ReservedCodeCacheSize < InitialCodeCacheSize) {
      jio_fprintf(defaultStream::error_stream(),
                  "Invalid ReservedCodeCacheSize: %dK. Must be at least InitialCodeCacheSize=%dK.\n",
                  ReservedCodeCacheSize/K, InitialCodeCacheSize/K);
      status = false;
    } else if (ReservedCodeCacheSize < min_code_cache_size) {
*** 2764,2785 ****
          return err;
        }
        if (FLAG_SET_CMDLINE(intx, ThreadStackSize, value) != Flag::SUCCESS) {
          return JNI_EINVAL;
        }
-     } else if (match_option(option, "-XX:CodeCacheExpansionSize=", &tail)) {
-       julong long_CodeCacheExpansionSize = 0;
-       ArgsRange errcode = parse_memory_size(tail, &long_CodeCacheExpansionSize, os::vm_page_size());
-       if (errcode != arg_in_range) {
-         jio_fprintf(defaultStream::error_stream(),
-                    "Invalid argument: %s. Must be at least %luK.\n", option->optionString,
-                    os::vm_page_size()/K);
-         return JNI_EINVAL;
-       }
-       if (FLAG_SET_CMDLINE(uintx, CodeCacheExpansionSize, (uintx)long_CodeCacheExpansionSize) != Flag::SUCCESS) {
-         return JNI_EINVAL;
-       }
      } else if (match_option(option, "-Xmaxjitcodesize", &tail) ||
                 match_option(option, "-XX:ReservedCodeCacheSize=", &tail)) {
        julong long_ReservedCodeCacheSize = 0;
  
        ArgsRange errcode = parse_memory_size(tail, &long_ReservedCodeCacheSize, 1);
--- 2759,2768 ----
*** 2789,2837 ****
          return JNI_EINVAL;
        }
        if (FLAG_SET_CMDLINE(uintx, ReservedCodeCacheSize, (uintx)long_ReservedCodeCacheSize) != Flag::SUCCESS) {
          return JNI_EINVAL;
        }
-       // -XX:NonNMethodCodeHeapSize=
-     } else if (match_option(option, "-XX:NonNMethodCodeHeapSize=", &tail)) {
-       julong long_NonNMethodCodeHeapSize = 0;
- 
-       ArgsRange errcode = parse_memory_size(tail, &long_NonNMethodCodeHeapSize, 1);
-       if (errcode != arg_in_range) {
-         jio_fprintf(defaultStream::error_stream(),
-                     "Invalid maximum non-nmethod code heap size: %s.\n", option->optionString);
-         return JNI_EINVAL;
-       }
-       if (FLAG_SET_CMDLINE(uintx, NonNMethodCodeHeapSize, (uintx)long_NonNMethodCodeHeapSize) != Flag::SUCCESS) {
-         return JNI_EINVAL;
-       }
-       // -XX:ProfiledCodeHeapSize=
-     } else if (match_option(option, "-XX:ProfiledCodeHeapSize=", &tail)) {
-       julong long_ProfiledCodeHeapSize = 0;
- 
-       ArgsRange errcode = parse_memory_size(tail, &long_ProfiledCodeHeapSize, 1);
-       if (errcode != arg_in_range) {
-         jio_fprintf(defaultStream::error_stream(),
-                     "Invalid maximum profiled code heap size: %s.\n", option->optionString);
-         return JNI_EINVAL;
-       }
-       if (FLAG_SET_CMDLINE(uintx, ProfiledCodeHeapSize, (uintx)long_ProfiledCodeHeapSize) != Flag::SUCCESS) {
-         return JNI_EINVAL;
-       }
-       // -XX:NonProfiledCodeHeapSizee=
-     } else if (match_option(option, "-XX:NonProfiledCodeHeapSize=", &tail)) {
-       julong long_NonProfiledCodeHeapSize = 0;
- 
-       ArgsRange errcode = parse_memory_size(tail, &long_NonProfiledCodeHeapSize, 1);
-       if (errcode != arg_in_range) {
-         jio_fprintf(defaultStream::error_stream(),
-                     "Invalid maximum non-profiled code heap size: %s.\n", option->optionString);
-         return JNI_EINVAL;
-       }
-       if (FLAG_SET_CMDLINE(uintx, NonProfiledCodeHeapSize, (uintx)long_NonProfiledCodeHeapSize) != Flag::SUCCESS) {
-         return JNI_EINVAL;
-       }
      // -green
      } else if (match_option(option, "-green")) {
        jio_fprintf(defaultStream::error_stream(),
                    "Green threads support not available\n");
            return JNI_EINVAL;
--- 2772,2781 ----