src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp

*** 32,45 ****
  #include "runtime/commandLineFlagRangeList.hpp"
  #include "runtime/globals.hpp"
  #include "utilities/defaultStream.hpp"
  
  Flag::Error AliasLevelConstraintFunc(intx value, bool verbose) {
!   if ((value <= 1) && (Arguments::mode() == Arguments::_comp)) {
      CommandLineError::print(verbose,
                              "AliasLevel (" INTX_FORMAT ") is not "
!                             "compatible with -Xcomp \n",
                              value);
      return Flag::VIOLATES_CONSTRAINT;
    } else {
      return Flag::SUCCESS;
    }
--- 32,45 ----
  #include "runtime/commandLineFlagRangeList.hpp"
  #include "runtime/globals.hpp"
  #include "utilities/defaultStream.hpp"
  
  Flag::Error AliasLevelConstraintFunc(intx value, bool verbose) {
!   if ((value <= 1) && (Arguments::mode() == Arguments::_comp || Arguments::mode() == Arguments::_mixed)) {
      CommandLineError::print(verbose,
                              "AliasLevel (" INTX_FORMAT ") is not "
!                             "compatible with -Xcomp or -Xmixed\n",
                              value);
      return Flag::VIOLATES_CONSTRAINT;
    } else {
      return Flag::SUCCESS;
    }
*** 116,129 ****
  
    return Flag::SUCCESS;
  }
  
  Flag::Error AllocatePrefetchStepSizeConstraintFunc(intx value, bool verbose) {
!   if (value < 0 || value > max_jint) {
      CommandLineError::print(verbose,
                              "AllocatePrefetchStepSize (" INTX_FORMAT ") "
!                             "must be between 0 and %d\n",
                              AllocatePrefetchStepSize,
                              max_jint);
      return Flag::VIOLATES_CONSTRAINT;
    }
  
--- 116,129 ----
  
    return Flag::SUCCESS;
  }
  
  Flag::Error AllocatePrefetchStepSizeConstraintFunc(intx value, bool verbose) {
!   if (value < 1 || value > max_jint) {
      CommandLineError::print(verbose,
                              "AllocatePrefetchStepSize (" INTX_FORMAT ") "
!                             "must be between 1 and %d\n",
                              AllocatePrefetchStepSize,
                              max_jint);
      return Flag::VIOLATES_CONSTRAINT;
    }
  
*** 204,214 ****
  
  Flag::Error CodeCacheSegmentSizeConstraintFunc(uintx value, bool verbose) {
    if (CodeCacheSegmentSize < (uintx)CodeEntryAlignment) {
      CommandLineError::print(verbose,
                              "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
!                             "larger than or equal to CodeEntryAlignment (" INTX_FORMAT ")"
                              "to align entry points\n",
                              CodeCacheSegmentSize, CodeEntryAlignment);
      return Flag::VIOLATES_CONSTRAINT;
    }
  
--- 204,214 ----
  
  Flag::Error CodeCacheSegmentSizeConstraintFunc(uintx value, bool verbose) {
    if (CodeCacheSegmentSize < (uintx)CodeEntryAlignment) {
      CommandLineError::print(verbose,
                              "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
!                             "larger than or equal to CodeEntryAlignment (" INTX_FORMAT ") "
                              "to align entry points\n",
                              CodeCacheSegmentSize, CodeEntryAlignment);
      return Flag::VIOLATES_CONSTRAINT;
    }
  
*** 222,251 ****
  
  #ifdef COMPILER2
    if (CodeCacheSegmentSize < (uintx)OptoLoopAlignment) {
      CommandLineError::print(verbose,
                              "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
!                             "larger than or equal to OptoLoopAlignment (" INTX_FORMAT ")"
                              "to align inner loops\n",
                              CodeCacheSegmentSize, OptoLoopAlignment);
      return Flag::VIOLATES_CONSTRAINT;
    }
  #endif
  
    return Flag::SUCCESS;
  }
  
  Flag::Error CompilerThreadPriorityConstraintFunc(intx value, bool verbose) {
!   if (value < min_jint || value > max_jint) {
!     CommandLineError::print(verbose,
!                             "CompileThreadPriority (" INTX_FORMAT ") "
!                             "must be between %d and %d. "
!                             "Please also make sure to specify values that are "
!                             "meaningful to your operating system\n",
!                             value, min_jint, max_jint);
      return Flag::VIOLATES_CONSTRAINT;
    }
  
    return Flag::SUCCESS;
  }
  
  Flag::Error CodeEntryAlignmentConstraintFunc(intx value, bool verbose) {
--- 222,253 ----
  
  #ifdef COMPILER2
    if (CodeCacheSegmentSize < (uintx)OptoLoopAlignment) {
      CommandLineError::print(verbose,
                              "CodeCacheSegmentSize  (" UINTX_FORMAT ") must be "
!                             "larger than or equal to OptoLoopAlignment (" INTX_FORMAT ") "
                              "to align inner loops\n",
                              CodeCacheSegmentSize, OptoLoopAlignment);
      return Flag::VIOLATES_CONSTRAINT;
    }
  #endif
  
    return Flag::SUCCESS;
  }
  
  Flag::Error CompilerThreadPriorityConstraintFunc(intx value, bool verbose) {
! #ifdef SOLARIS
!   if ((value < MinimumPriority || value > MaximumPriority) 
!         && (value != -1) && (value != -FXCriticalPriority)) {
!     CommandLineError::print(verbose,
!                             "CompileThreadPriority (" INTX_FORMAT ") must be "
!                             "between %d and %d inclusively or -1(means no change) "
!                             "or %d(special value for critical thread class/priority)\n",
!                             value, MinimumPriority, MaximumPriority, -FXCriticalPriority);
      return Flag::VIOLATES_CONSTRAINT;
    }
+ #endif
  
    return Flag::SUCCESS;
  }
  
  Flag::Error CodeEntryAlignmentConstraintFunc(intx value, bool verbose) {
*** 275,292 ****
  
    return Flag::SUCCESS;
  }
  
  Flag::Error OptoLoopAlignmentConstraintFunc(intx value, bool verbose) {
-   if (value < 0 || value > 16) {
-     CommandLineError::print(verbose,
-                             "OptoLoopAlignment (" INTX_FORMAT ") "
-                             "must be between 0 and 16\n",
-                             value);
-     return Flag::VIOLATES_CONSTRAINT;
-   }
- 
    if (!is_power_of_2(value)) {
      CommandLineError::print(verbose,
                              "OptoLoopAlignment (" INTX_FORMAT ") "
                              "must be a power of two\n",
                              value);
--- 277,286 ----
*** 306,326 ****
  }
  
  Flag::Error ArraycopyDstPrefetchDistanceConstraintFunc(uintx value, bool verbose) {
    if (value != 0) {
      CommandLineError::print(verbose,
!                             "ArraycopyDstPrefetchDistance (" INTX_FORMAT ") must be 0\n");
      return Flag::VIOLATES_CONSTRAINT;
    }
  
    return Flag::SUCCESS;
  }
  
  Flag::Error ArraycopySrcPrefetchDistanceConstraintFunc(uintx value, bool verbose) {
    if (value != 0) {
      CommandLineError::print(verbose,
!                             "ArraycopySrcPrefetchDistance (" INTX_FORMAT ") must be 0\n");
      return Flag::VIOLATES_CONSTRAINT;
    }
  
    return Flag::SUCCESS;
  }
--- 300,322 ----
  }
  
  Flag::Error ArraycopyDstPrefetchDistanceConstraintFunc(uintx value, bool verbose) {
    if (value != 0) {
      CommandLineError::print(verbose,
!                             "ArraycopyDstPrefetchDistance (" UINTX_FORMAT ") must be 0\n",
!                             value);
      return Flag::VIOLATES_CONSTRAINT;
    }
  
    return Flag::SUCCESS;
  }
  
  Flag::Error ArraycopySrcPrefetchDistanceConstraintFunc(uintx value, bool verbose) {
    if (value != 0) {
      CommandLineError::print(verbose,
!                             "ArraycopySrcPrefetchDistance (" UINTX_FORMAT ") must be 0\n",
!                             value);
      return Flag::VIOLATES_CONSTRAINT;
    }
  
    return Flag::SUCCESS;
  }