src/cpu/aarch64/vm/aarch64.ad

*** 3891,3912 ****
    interface(CONST_INTER);
  %}
  
  operand immL_bitmask()
  %{
!   predicate(((n->get_long() & 0xc000000000000000l) == 0)
              && is_power_of_2(n->get_long() + 1));
    match(ConL);
  
    op_cost(0);
    format %{ %}
    interface(CONST_INTER);
  %}
  
  operand immI_bitmask()
  %{
!   predicate(((n->get_int() & 0xc0000000) == 0)
              && is_power_of_2(n->get_int() + 1));
    match(ConI);
  
    op_cost(0);
    format %{ %}
--- 3891,3914 ----
    interface(CONST_INTER);
  %}
  
  operand immL_bitmask()
  %{
!   predicate((n->get_long() != 0)
!             && ((n->get_long() & 0xc000000000000000l) == 0)
              && is_power_of_2(n->get_long() + 1));
    match(ConL);
  
    op_cost(0);
    format %{ %}
    interface(CONST_INTER);
  %}
  
  operand immI_bitmask()
  %{
!   predicate((n->get_int() != 0)
!             && ((n->get_int() & 0xc0000000) == 0)
              && is_power_of_2(n->get_int() + 1));
    match(ConI);
  
    op_cost(0);
    format %{ %}
*** 10903,10934 ****
  // Bitfield extract with shift & mask
  
  instruct ubfxwI(iRegINoSp dst, iRegIorL2I src, immI rshift, immI_bitmask mask)
  %{
    match(Set dst (AndI (URShiftI src rshift) mask));
  
    ins_cost(INSN_COST);
    format %{ "ubfxw $dst, $src, $mask" %}
    ins_encode %{
!     int rshift = $rshift$$constant;
      long mask = $mask$$constant;
      int width = exact_log2(mask+1);
      __ ubfxw(as_Register($dst$$reg),
              as_Register($src$$reg), rshift, width);
    %}
    ins_pipe(ialu_reg_shift);
  %}
  instruct ubfxL(iRegLNoSp dst, iRegL src, immI rshift, immL_bitmask mask)
  %{
    match(Set dst (AndL (URShiftL src rshift) mask));
  
    ins_cost(INSN_COST);
    format %{ "ubfx $dst, $src, $mask" %}
    ins_encode %{
!     int rshift = $rshift$$constant;
      long mask = $mask$$constant;
!     int width = exact_log2(mask+1);
      __ ubfx(as_Register($dst$$reg),
              as_Register($src$$reg), rshift, width);
    %}
    ins_pipe(ialu_reg_shift);
  %}
--- 10905,10940 ----
  // Bitfield extract with shift & mask
  
  instruct ubfxwI(iRegINoSp dst, iRegIorL2I src, immI rshift, immI_bitmask mask)
  %{
    match(Set dst (AndI (URShiftI src rshift) mask));
+   // Make sure we are not going to exceed what ubfxw can do.
+   predicate((exact_log2(n->in(2)->get_int() + 1) + (n->in(1)->in(2)->get_int() & 31)) <= (31 + 1));
  
    ins_cost(INSN_COST);
    format %{ "ubfxw $dst, $src, $mask" %}
    ins_encode %{
!     int rshift = $rshift$$constant & 31;
      long mask = $mask$$constant;
      int width = exact_log2(mask+1);
      __ ubfxw(as_Register($dst$$reg),
              as_Register($src$$reg), rshift, width);
    %}
    ins_pipe(ialu_reg_shift);
  %}
  instruct ubfxL(iRegLNoSp dst, iRegL src, immI rshift, immL_bitmask mask)
  %{
    match(Set dst (AndL (URShiftL src rshift) mask));
+   // Make sure we are not going to exceed what ubfx can do.
+   predicate((exact_log2_long(n->in(2)->get_long() + 1) + (n->in(1)->in(2)->get_int() & 63)) <= (63 + 1));
  
    ins_cost(INSN_COST);
    format %{ "ubfx $dst, $src, $mask" %}
    ins_encode %{
!     int rshift = $rshift$$constant & 63;
      long mask = $mask$$constant;
!     int width = exact_log2_long(mask+1);
      __ ubfx(as_Register($dst$$reg),
              as_Register($src$$reg), rshift, width);
    %}
    ins_pipe(ialu_reg_shift);
  %}
*** 10936,10950 ****
  // We can use ubfx when extending an And with a mask when we know mask
  // is positive.  We know that because immI_bitmask guarantees it.
  instruct ubfxIConvI2L(iRegLNoSp dst, iRegIorL2I src, immI rshift, immI_bitmask mask)
  %{
    match(Set dst (ConvI2L (AndI (URShiftI src rshift) mask)));
  
    ins_cost(INSN_COST * 2);
    format %{ "ubfx $dst, $src, $mask" %}
    ins_encode %{
!     int rshift = $rshift$$constant;
      long mask = $mask$$constant;
      int width = exact_log2(mask+1);
      __ ubfx(as_Register($dst$$reg),
              as_Register($src$$reg), rshift, width);
    %}
--- 10942,10958 ----
  // We can use ubfx when extending an And with a mask when we know mask
  // is positive.  We know that because immI_bitmask guarantees it.
  instruct ubfxIConvI2L(iRegLNoSp dst, iRegIorL2I src, immI rshift, immI_bitmask mask)
  %{
    match(Set dst (ConvI2L (AndI (URShiftI src rshift) mask)));
+   // Make sure we are not going to exceed what ubfxw can do.
+   predicate((exact_log2(n->in(1)->in(2)->get_int() + 1) + (n->in(1)->in(1)->in(2)->get_int() & 31)) <= (31 + 1));
  
    ins_cost(INSN_COST * 2);
    format %{ "ubfx $dst, $src, $mask" %}
    ins_encode %{
!     int rshift = $rshift$$constant & 31;
      long mask = $mask$$constant;
      int width = exact_log2(mask+1);
      __ ubfx(as_Register($dst$$reg),
              as_Register($src$$reg), rshift, width);
    %}