*** old/src/cpu/x86/vm/vm_version_x86.cpp	Tue Feb 11 13:33:04 2014
--- new/src/cpu/x86/vm/vm_version_x86.cpp	Tue Feb 11 13:33:04 2014

*** 427,437 ****
--- 427,437 ----
      // 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",
!   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",
                 cores_per_cpu(), threads_per_core(),
                 cpu_family(), _model, _stepping,
                 (supports_cmov() ? ", cmov" : ""),
                 (supports_cmpxchg8() ? ", cx8" : ""),
                 (supports_fxsr() ? ", fxsr" : ""),

*** 453,463 ****
--- 453,465 ----
                 (supports_lzcnt()   ? ", lzcnt": ""),
                 (supports_sse4a()   ? ", sse4a": ""),
                 (supports_ht() ? ", ht": ""),
                 (supports_tsc() ? ", tsc": ""),
                 (supports_tscinv_bit() ? ", tscinvbit": ""),
!                (supports_tscinv() ? ", tscinv": ""));
!                (supports_tscinv() ? ", tscinv": ""),
+                (supports_bmi1() ? ", bmi1" : ""),
+                (supports_bmi2() ? ", bmi2" : ""));
    _features_str = strdup(buf);
  
    // UseSSE is set to the smaller of what hardware supports and what
    // the command line requires.  I.e., you cannot set UseSSE to 2 on
    // older Pentiums which do not support it.

*** 598,614 ****
--- 600,609 ----
        if( supports_sse4_2() && UseSSE >= 4 ) {
          UseSSE42Intrinsics = true;
        }
      }
  
      // Use count leading zeros count instruction if available.
      if (supports_lzcnt()) {
        if (FLAG_IS_DEFAULT(UseCountLeadingZerosInstruction)) {
          UseCountLeadingZerosInstruction = true;
        }
      }
  
      // some defaults for AMD family 15h
      if ( cpu_family() == 0x15 ) {
        // On family 15h processors default is no sw prefetch
        if (FLAG_IS_DEFAULT(AllocatePrefetchStyle)) {
          AllocatePrefetchStyle = 0;

*** 690,699 ****
--- 685,723 ----
        // from signal handler.
        FLAG_SET_DEFAULT(MaxVectorSize, 16);
      }
  #endif // COMPILER2
  
+   // Use count leading zeros count instruction if available.
+   if (supports_lzcnt()) {
+     if (FLAG_IS_DEFAULT(UseCountLeadingZerosInstruction)) {
+       UseCountLeadingZerosInstruction = true;
+     }
+    } else if (UseCountLeadingZerosInstruction) {
+     warning("lzcnt instruction is not available on this CPU");
+     FLAG_SET_DEFAULT(UseCountLeadingZerosInstruction, false);
+   }
+ 
+   if (supports_bmi1()) {
+     if (FLAG_IS_DEFAULT(UseBMI1Instructions)) {
+       UseBMI1Instructions = true;
+     }
+   } else if (UseBMI1Instructions) {
+     warning("BMI1 instructions are not available on this CPU");
+     FLAG_SET_DEFAULT(UseBMI1Instructions, false);
+   }
+ 
+   // Use count trailing zeros instruction if available
+   if (supports_bmi1()) {
+     if (FLAG_IS_DEFAULT(UseCountTrailingZerosInstruction)) {
+       UseCountTrailingZerosInstruction = UseBMI1Instructions;
+     }
+   } else if (UseCountTrailingZerosInstruction) {
+     warning("tzcnt instruction is not available on this CPU");
+     FLAG_SET_DEFAULT(UseCountTrailingZerosInstruction, false);
+   }
+ 
    // Use population count instruction if available.
    if (supports_popcnt()) {
      if (FLAG_IS_DEFAULT(UsePopCountInstruction)) {
        UsePopCountInstruction = true;
      }