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

rev 59103 : imported patch hotspot

*** 130,142 ****
    return JVMFlag::SUCCESS;
  }
  
  JVMFlag::Error AllocatePrefetchInstrConstraintFunc(intx value, bool verbose) {
    intx max_value = max_intx;
! #if defined(SPARC)
!   max_value = 1;
! #elif defined(X86)
    max_value = 3;
  #endif
    if (value < 0 || value > max_value) {
      JVMFlag::printError(verbose,
                          "AllocatePrefetchInstr (" INTX_FORMAT ") must be "
--- 130,140 ----
    return JVMFlag::SUCCESS;
  }
  
  JVMFlag::Error AllocatePrefetchInstrConstraintFunc(intx value, bool verbose) {
    intx max_value = max_intx;
! #if defined(X86)
    max_value = 3;
  #endif
    if (value < 0 || value > max_value) {
      JVMFlag::printError(verbose,
                          "AllocatePrefetchInstr (" INTX_FORMAT ") must be "
*** 234,268 ****
  
    return JVMFlag::SUCCESS;
  }
  
  JVMFlag::Error CompilerThreadPriorityConstraintFunc(intx value, bool verbose) {
- #ifdef SOLARIS
-   if ((value < MinimumPriority || value > MaximumPriority) &&
-       (value != -1) && (value != -FXCriticalPriority)) {
-     JVMFlag::printError(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 JVMFlag::VIOLATES_CONSTRAINT;
-   }
- #endif
- 
    return JVMFlag::SUCCESS;
  }
  
  JVMFlag::Error CodeEntryAlignmentConstraintFunc(intx value, bool verbose) {
- #ifdef SPARC
-   if (CodeEntryAlignment % relocInfo::addr_unit() != 0) {
-     JVMFlag::printError(verbose,
-                         "CodeEntryAlignment (" INTX_FORMAT ") must be "
-                         "multiple of NOP size\n", CodeEntryAlignment);
-     return JVMFlag::VIOLATES_CONSTRAINT;
-   }
- #endif
- 
    if (!is_power_of_2(value)) {
      JVMFlag::printError(verbose,
                          "CodeEntryAlignment (" INTX_FORMAT ") must be "
                          "a power of two\n", CodeEntryAlignment);
      return JVMFlag::VIOLATES_CONSTRAINT;
--- 232,245 ----
*** 286,296 ****
                          "must be a power of two\n",
                          value);
      return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
!   // Relevant on ppc, s390, sparc. Will be optimized where
    // addr_unit() == 1.
    if (OptoLoopAlignment % relocInfo::addr_unit() != 0) {
      JVMFlag::printError(verbose,
                          "OptoLoopAlignment (" INTX_FORMAT ") must be "
                          "multiple of NOP size (%d)\n",
--- 263,273 ----
                          "must be a power of two\n",
                          value);
      return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
!   // Relevant on ppc, s390. Will be optimized where
    // addr_unit() == 1.
    if (OptoLoopAlignment % relocInfo::addr_unit() != 0) {
      JVMFlag::printError(verbose,
                          "OptoLoopAlignment (" INTX_FORMAT ") must be "
                          "multiple of NOP size (%d)\n",
*** 353,380 ****
                         "less than or equal to CodeEntryAlignment (" INTX_FORMAT ")\n",
                         InteriorEntryAlignment, CodeEntryAlignment);
      return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
- #ifdef SPARC
-   if (InteriorEntryAlignment % relocInfo::addr_unit() != 0) {
-     JVMFlag::printError(verbose,
-                         "InteriorEntryAlignment (" INTX_FORMAT ") must be "
-                         "multiple of NOP size\n");
-     return JVMFlag::VIOLATES_CONSTRAINT;
-   }
- #endif
- 
    if (!is_power_of_2(value)) {
       JVMFlag::printError(verbose,
                           "InteriorEntryAlignment (" INTX_FORMAT ") must be "
                           "a power of two\n", InteriorEntryAlignment);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
  
    int minimum_alignment = 16;
! #if defined(SPARC) || (defined(X86) && !defined(AMD64))
    minimum_alignment = 4;
  #elif defined(S390)
    minimum_alignment = 2;
  #endif
  
--- 330,348 ----
                         "less than or equal to CodeEntryAlignment (" INTX_FORMAT ")\n",
                         InteriorEntryAlignment, CodeEntryAlignment);
      return JVMFlag::VIOLATES_CONSTRAINT;
    }
  
    if (!is_power_of_2(value)) {
       JVMFlag::printError(verbose,
                           "InteriorEntryAlignment (" INTX_FORMAT ") must be "
                           "a power of two\n", InteriorEntryAlignment);
       return JVMFlag::VIOLATES_CONSTRAINT;
     }
  
    int minimum_alignment = 16;
! #if defined(X86) && !defined(AMD64)
    minimum_alignment = 4;
  #elif defined(S390)
    minimum_alignment = 2;
  #endif