*** old/src/cpu/x86/vm/x86_64.ad	Wed Apr 22 20:27:25 2009
--- new/src/cpu/x86/vm/x86_64.ad	Wed Apr 22 20:27:25 2009

*** 1978,1987 ****
--- 1978,1994 ----
                   internal_word_Relocation::spec(float_address),
                   RELOC_DISP32);
  }
  
  
+ const bool Matcher::match_rule_supported(int opcode) {
+   if (!has_match_rule(opcode))
+     return false;
+ 
+   return true;  // Per default match rules are supported.
+ }
+ 
  int Matcher::regnum_to_fpu_offset(int regnum)
  {
    return regnum - 32; // The FP registers are in the second chunk
  }
  

*** 7654,7663 ****
--- 7661,7779 ----
    ins_encode( REX_reg_wide(src), OpcP, opc2_reg(src), REX_reg_mem_wide(src, dst), OpcT, reg_mem(src, dst) );
    ins_pipe( ialu_mem_reg );
  %}
  
  
+ //---------- Zeros Count Instructions ------------------------------------------
+ 
+ instruct countLeadingZerosI(rRegI dst, rRegI src, rFlagsReg cr) %{
+   predicate(UseCountLeadingZerosInstruction);
+   match(Set dst (CountLeadingZerosI src));
+   effect(KILL cr);
+ 
+   format %{ "lzcntl  $dst, $src\t# count leading zeros (int)" %}
+   ins_encode %{
+     __ lzcntl($dst$$Register, $src$$Register);
+   %}
+   ins_pipe(ialu_reg);
+ %}
+ 
+ instruct countLeadingZerosI_bsr(rRegI dst, rRegI src, rRegI tmp, rFlagsReg cr) %{
+   predicate(!UseCountLeadingZerosInstruction);
+   match(Set dst (CountLeadingZerosI src));
+   effect(TEMP dst, TEMP tmp, KILL cr);
+ 
+   format %{ "bsrl    $tmp, $src\t# count leading zeros (int)\n\t"
+             "jnz     skip\n\t"
+             "movl    $tmp, -1\n"
+       "skip:\n\t"
+             "movl    $dst, 31\n\t"
+             "subl    $dst, $tmp" %}
+   ins_encode %{
+     Label skip;
+     __ bsrl($tmp$$Register, $src$$Register);
+     __ jccb(Assembler::notZero, skip);
+     __ movl($tmp$$Register, -1);
+     __ bind(skip);
+     __ movl($dst$$Register, BitsPerInt - 1);
+     __ subl($dst$$Register, $tmp$$Register);
+   %}
+   ins_pipe(ialu_reg);
+ %}
+ 
+ instruct countLeadingZerosL(rRegI dst, rRegL src, rFlagsReg cr) %{
+   predicate(UseCountLeadingZerosInstruction);
+   match(Set dst (CountLeadingZerosL src));
+   effect(KILL cr);
+ 
+   format %{ "lzcntq  $dst, $src\t# count leading zeros (long)" %}
+   ins_encode %{
+     __ lzcntq($dst$$Register, $src$$Register);
+   %}
+   ins_pipe(ialu_reg);
+ %}
+ 
+ instruct countLeadingZerosL_bsr(rRegI dst, rRegL src, rRegI tmp, rFlagsReg cr) %{
+   predicate(!UseCountLeadingZerosInstruction);
+   match(Set dst (CountLeadingZerosL src));
+   effect(TEMP dst, TEMP tmp, KILL cr);
+ 
+   format %{ "bsrq    $tmp, $src\t# count leading zeros (long)\n\t"
+             "jnz     skip\n\t"
+             "movl    $tmp, -1\n"
+       "skip:\n\t"
+             "movl    $dst, 63\n\t"
+             "subl    $dst, $tmp" %}
+   ins_encode %{
+     Label skip;
+     __ bsrq($tmp$$Register, $src$$Register);
+     __ jccb(Assembler::notZero, skip);
+     __ movl($tmp$$Register, -1);
+     __ bind(skip);
+     __ movl($dst$$Register, BitsPerLong - 1);
+     __ subl($dst$$Register, $tmp$$Register);
+   %}
+   ins_pipe(ialu_reg);
+ %}
+ 
+ instruct countTrailingZerosI(rRegI dst, rRegI src, rFlagsReg cr) %{
+   match(Set dst (CountTrailingZerosI src));
+   effect(KILL cr);
+ 
+   format %{ "bsfl    $dst, $src\t# count trailing zeros (int)\n\t"
+             "jnz     done\n\t"
+             "movl    $dst, 32\n"
+       "done:" %}
+   ins_encode %{
+     Label done;
+     __ bsfl($dst$$Register, $src$$Register);
+     __ jccb(Assembler::notZero, done);
+     __ movl($dst$$Register, BitsPerInt);
+     __ bind(done);
+   %}
+   ins_pipe(ialu_reg);
+ %}
+ 
+ instruct countTrailingZerosL(rRegI dst, rRegL src, rFlagsReg cr) %{
+   match(Set dst (CountTrailingZerosL src));
+   effect(KILL cr);
+ 
+   format %{ "bsfq    $dst, $src\t# count trailing zeros (long)\n\t"
+             "jnz     done\n\t"
+             "movl    $dst, 64\n"
+       "done:" %}
+   ins_encode %{
+     Label done;
+     __ bsfq($dst$$Register, $src$$Register);
+     __ jccb(Assembler::notZero, done);
+     __ movl($dst$$Register, BitsPerLong);
+     __ bind(done);
+   %}
+   ins_pipe(ialu_reg);
+ %}
+ 
+ 
  //---------- Population Count Instructions -------------------------------------
  
  instruct popCountI(rRegI dst, rRegI src) %{
    predicate(UsePopCountInstruction);
    match(Set dst (PopCountI src));