*** old/src/cpu/x86/vm/vm_version_x86.cpp	Mon Mar 17 11:39:18 2014
--- new/src/cpu/x86/vm/vm_version_x86.cpp	Mon Mar 17 11:39:18 2014

*** 473,483 ****
--- 473,483 ----
      // HT processor could be installed on a system which doesn't support HT.
      _cpuFeatures &= ~CPU_HT;
    }
  
    char buf[256];
!   jio_snprintf(buf, sizeof(buf), "(%u cores per cpu, %u threads per core) family %d model %d stepping %d%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
!   jio_snprintf(buf, sizeof(buf), "(%u cores per cpu, %u threads per core) family %d model %d stepping %d%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
                 cores_per_cpu(), threads_per_core(),
                 cpu_family(), _model, _stepping,
                 (supports_cmov() ? ", cmov" : ""),
                 (supports_cmpxchg8() ? ", cx8" : ""),
                 (supports_fxsr() ? ", fxsr" : ""),

*** 492,501 ****
--- 492,502 ----
                 (supports_avx()    ? ", avx" : ""),
                 (supports_avx2()   ? ", avx2" : ""),
                 (supports_aes()    ? ", aes" : ""),
                 (supports_clmul()  ? ", clmul" : ""),
                 (supports_erms()   ? ", erms" : ""),
+                (supports_rtm()    ? ", rtm" : ""),
                 (supports_mmx_ext() ? ", mmxext" : ""),
                 (supports_3dnow_prefetch() ? ", 3dnowpref" : ""),
                 (supports_lzcnt()   ? ", lzcnt": ""),
                 (supports_sse4a()   ? ", sse4a": ""),
                 (supports_ht() ? ", ht": ""),

*** 532,542 ****
--- 533,543 ----
      if (FLAG_IS_DEFAULT(UseAES)) {
        UseAES = true;
      }
    } else if (UseAES) {
      if (!FLAG_IS_DEFAULT(UseAES))
!       warning("AES instructions are not available on this CPU");
      FLAG_SET_DEFAULT(UseAES, false);
    }
  
    // Use CLMUL instructions if available.
    if (supports_clmul()) {

*** 565,578 ****
--- 566,626 ----
      if (FLAG_IS_DEFAULT(UseAESIntrinsics)) {
        UseAESIntrinsics = true;
      }
    } else if (UseAESIntrinsics) {
      if (!FLAG_IS_DEFAULT(UseAESIntrinsics))
!       warning("AES intrinsics are not available on this CPU");
      FLAG_SET_DEFAULT(UseAESIntrinsics, false);
    }
  
+   // Adjust RTM (Restricted Transactional Memory) flags
+   if (!supports_rtm() && UseRTMLocking) {
+     // Can't continue because UseRTMLocking affects UseBiasedLocking flag
+     // setting during arguments processing. See use_biased_locking().
+     // VM_Version_init() is executed after UseBiasedLocking is used
+     // in Thread::allocate().
+     vm_exit_during_initialization("RTM instructions are not available on this CPU");
+   }
+ 
+ #if INCLUDE_RTM_OPT
+   if (UseRTMLocking) {
+     if (!FLAG_IS_CMDLINE(UseRTMLocking)) {
+       // RTM locking should be used only for applications with
+       // high lock contention. For now we do not use it by default.
+       vm_exit_during_initialization("UseRTMLocking flag should be only set on command line");
+     }
+     if (!is_power_of_2(RTMTotalCountIncrRate)) {
+       warning("RTMTotalCountIncrRate must be a power of 2, reseting it to 64");
+       FLAG_SET_DEFAULT(RTMTotalCountIncrRate, 64);
+     }
+     if (RTMAbortRatio < 0 || RTMAbortRatio > 100) {
+       warning("RTMAbortRatio must be in the range 0 to 100, reseting it to 50");
+       FLAG_SET_DEFAULT(RTMAbortRatio, 50);
+     }
+   } else { // !UseRTMLocking
+     if (UseRTMForStackLocks) {
+       if (!FLAG_IS_DEFAULT(UseRTMForStackLocks)) {
+         warning("UseRTMForStackLocks flag should be off when UseRTMLocking flag is off");
+       }
+       FLAG_SET_DEFAULT(UseRTMForStackLocks, false);
+     }
+     if (UseRTMDeopt) {
+       FLAG_SET_DEFAULT(UseRTMDeopt, false);
+     }
+     if (PrintPreciseRTMLockingStatistics) {
+       FLAG_SET_DEFAULT(PrintPreciseRTMLockingStatistics, false);
+     }
+   }
+ #else
+   if (UseRTMLocking) {
+     // Only C2 does RTM locking optimization.
+     // Can't continue because UseRTMLocking affects UseBiasedLocking flag
+     // setting during arguments processing. See use_biased_locking().
+     vm_exit_during_initialization("RTM locking optimization is not supported in this VM");
+   }
+ #endif
+ 
  #ifdef COMPILER2
    if (UseFPUForSpilling) {
      if (UseSSE < 2) {
        // Only supported with SSE2+
        FLAG_SET_DEFAULT(UseFPUForSpilling, false);

*** 911,920 ****
--- 959,986 ----
      }
    }
  #endif // !PRODUCT
  }
  
+ bool VM_Version::use_biased_locking() {
+ #if INCLUDE_RTM_OPT
+   // RTM locking is most useful when there is high lock contention and
+   // low data contention.  With high lock contention the lock is usually
+   // inflated and biased locking is not suitable for that case.
+   // RTM locking code requires that biased locking is off.
+   if (UseRTMLocking && UseBiasedLocking) {
+     if (FLAG_IS_DEFAULT(UseBiasedLocking)) {
+       FLAG_SET_DEFAULT(UseBiasedLocking, false);
+     } else {
+       warning("Biased locking is not supported with RTM locking; ignoring UseBiasedLocking flag." );
+       UseBiasedLocking = false;
+     }
+   }
+ #endif
+   return UseBiasedLocking;
+ }
+ 
  void VM_Version::initialize() {
    ResourceMark rm;
    // Making this stub must be FIRST use of assembler
  
    stub_blob = BufferBlob::create("getPsrInfo_stub", stub_size);