< prev index next >

src/hotspot/cpu/aarch64/gc/shenandoah/shenandoah_aarch64.ad

Print this page
@@ -20,240 +20,374 @@
  // or visit www.oracle.com if you need additional information or have any
  // questions.
  //
  //
  
- source_hpp %{
+ source %{
  #include "gc/shenandoah/shenandoahBarrierSet.hpp"
- #include "gc/shenandoah/shenandoahBarrierSetAssembler.hpp"
+ #include "gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.hpp"
+ #include "gc/shenandoah/c2/shenandoahBarrierSetC2.hpp"
  %}
  
- encode %{
-   enc_class aarch64_enc_cmpxchg_oop_shenandoah(memory mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, iRegINoSp res) %{
-     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
-     Register tmp = $tmp$$Register;
-     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-     ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
-                                                    /*acquire*/ false, /*release*/ true, /*is_cae*/ false, $res$$Register);
+ instruct store_P_Normal_shenandoah(memory8 mem, iRegP src, iRegPNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set mem (StoreP mem src));
+   predicate(UseShenandoahGC && !needs_releasing_store(n) && n->as_Store()->barrier_data() != 0);
+   effect(TEMP tmp, KILL cr);
+   ins_cost(3*INSN_COST);
+   format %{ "str $src, $mem" %}
+   ins_encode %{
+     const Address addr = mem2address($mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
+     ShenandoahBarrierSet::assembler()->store_c2(this, masm,
+       addr,           /* dst_narrow  = */ false,
+       $src$$Register, /* src_narrow  = */ false,
+       $tmp$$Register);
    %}
+   ins_pipe(pipe_class_memory);
+ %}
  
-   enc_class aarch64_enc_cmpxchg_acq_oop_shenandoah(memory mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, iRegINoSp res) %{
-     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
-     Register tmp = $tmp$$Register;
-     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-     ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
-                                                    /*acquire*/ true, /*release*/ true, /*is_cae*/ false, $res$$Register);
+ instruct store_P_Volatile_shenandoah(indirect mem, iRegP src, iRegPNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set mem (StoreP mem src));
+   predicate(UseShenandoahGC && needs_releasing_store(n) && n->as_Store()->barrier_data() != 0);
+   effect(TEMP tmp, KILL cr);
+   ins_cost(VOLATILE_REF_COST);
+   format %{ "str $src, $mem" %}
+   ins_encode %{
+     ShenandoahBarrierSet::assembler()->store_c2(this, masm,
+       Address($mem$$Register),    /* dst_narrow  = */ false,
+       $src$$Register,             /* src_narrow  = */ false,
+       $tmp$$Register);
    %}
+   ins_pipe(pipe_class_memory);
  %}
  
- instruct compareAndSwapP_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
- 
-   match(Set res (ShenandoahCompareAndSwapP mem (Binary oldval newval)));
-   ins_cost(2 * VOLATILE_REF_COST);
- 
+ instruct store_N_Normal_shenandoah(memory4 mem, iRegN src, iRegNNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set mem (StoreN mem src));
+   predicate(UseShenandoahGC && !needs_releasing_store(n) && n->as_Store()->barrier_data() != 0);
    effect(TEMP tmp, KILL cr);
- 
-   format %{
-     "cmpxchg_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
+   ins_cost(3*INSN_COST);
+   format %{ "str $src, $mem" %}
+   ins_encode %{
+     const Address addr = mem2address($mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
+     ShenandoahBarrierSet::assembler()->store_c2(this, masm,
+       addr,           /* dst_narrow  = */ true,
+       $src$$Register, /* src_narrow  = */ true,
+       $tmp$$Register);
    %}
- 
-   ins_encode(aarch64_enc_cmpxchg_oop_shenandoah(mem, oldval, newval, tmp, res));
- 
-   ins_pipe(pipe_slow);
+   ins_pipe(pipe_class_memory);
  %}
  
- instruct compareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
- 
-   match(Set res (ShenandoahCompareAndSwapN mem (Binary oldval newval)));
-   ins_cost(2 * VOLATILE_REF_COST);
- 
+ instruct store_N_Volatile_shenandoah(indirect mem, iRegN src, iRegNNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set mem (StoreN mem src));
+   predicate(UseShenandoahGC && needs_releasing_store(n) && n->as_Store()->barrier_data() != 0);
    effect(TEMP tmp, KILL cr);
- 
-   format %{
-     "cmpxchgw_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
+   ins_cost(VOLATILE_REF_COST);
+   format %{ "str $src, $mem" %}
+   ins_encode %{
+     ShenandoahBarrierSet::assembler()->store_c2(this, masm,
+       Address($mem$$Register),    /* dst_narrow  = */ true,
+       $src$$Register,             /* src_narrow  = */ true,
+       $tmp$$Register);
    %}
+   ins_pipe(pipe_class_memory);
+ %}
  
+ instruct encodePAndStoreN_Normal_shenandoah(memory4 mem, iRegP src, iRegPNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set mem (StoreN mem (EncodeP src)));
+   predicate(UseShenandoahGC && !needs_releasing_store(n) && n->as_Store()->barrier_data() != 0);
+   effect(TEMP tmp, KILL cr);
+   ins_cost(4*INSN_COST);
+   format %{ "encode_heap_oop tmp, $src\n\t"
+             "str  tmp, $mem\t# compressed ptr" %}
    ins_encode %{
-     Register tmp = $tmp$$Register;
-     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-     ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ false, /*release*/ true, /*is_cae*/ false, $res$$Register);
+     const Address addr = mem2address($mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
+     ShenandoahBarrierSet::assembler()->store_c2(this, masm,
+       addr,                    /* dst_narrow  = */ true,
+       $src$$Register,          /* src_narrow  = */ false,
+       $tmp$$Register);
    %}
- 
-   ins_pipe(pipe_slow);
+   ins_pipe(pipe_class_memory);
  %}
  
- instruct compareAndSwapPAcq_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
- 
-   predicate(needs_acquiring_load_exclusive(n));
-   match(Set res (ShenandoahCompareAndSwapP mem (Binary oldval newval)));
-   ins_cost(VOLATILE_REF_COST);
- 
+ instruct encodePAndStoreN_Volatile_shenandoah(indirect mem, iRegP src, iRegPNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set mem (StoreN mem (EncodeP src)));
+   predicate(UseShenandoahGC && needs_releasing_store(n) && n->as_Store()->barrier_data() != 0);
    effect(TEMP tmp, KILL cr);
+   ins_cost(4*INSN_COST);
+   format %{ "encode_heap_oop tmp, $src\n\t"
+             "str  tmp, $mem\t# compressed ptr" %}
+   ins_encode %{
+     ShenandoahBarrierSet::assembler()->store_c2(this, masm,
+       Address($mem$$Register), /* dst_narrow  = */ true,
+       $src$$Register,          /* src_narrow  = */ false,
+       $tmp$$Register);
+   %}
+   ins_pipe(pipe_class_memory);
+ %}
  
+ instruct compareAndSwap_P_shenandoah(iRegINoSp res, indirect mem, iRegPNoSp oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set res (CompareAndSwapP mem (Binary oldval newval)));
+   predicate(UseShenandoahGC && n->as_LoadStore()->barrier_data() != 0);
+   ins_cost(VOLATILE_REF_COST);
+   effect(TEMP_DEF res, TEMP tmp, KILL cr);
    format %{
-     "cmpxchg_acq_shenandoah_oop $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
+     "cmpxchg_P_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval"
    %}
+   ins_encode %{
+     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
  
-   ins_encode(aarch64_enc_cmpxchg_acq_oop_shenandoah(mem, oldval, newval, tmp, res));
+     ShenandoahBarrierSet::assembler()->compare_and_set_c2(this, masm,
+       $res$$Register,
+       $mem$$base$$Register,
+       $oldval$$Register,
+       $newval$$Register,
+       $tmp$$Register,
+       /* exchange */ false,
+       /* maybe_null */ true,
+       /* is_narrow */ false,
+       /* weak */ false);
+   %}
  
    ins_pipe(pipe_slow);
  %}
  
- instruct compareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
- 
-   predicate(needs_acquiring_load_exclusive(n));
-   match(Set res (ShenandoahCompareAndSwapN mem (Binary oldval newval)));
+ instruct compareAndSwap_N_shenandoah(iRegINoSp res, indirect mem, iRegNNoSp oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set res (CompareAndSwapN mem (Binary oldval newval)));
+   predicate(UseShenandoahGC && n->as_LoadStore()->barrier_data() != 0);
    ins_cost(VOLATILE_REF_COST);
- 
-   effect(TEMP tmp, KILL cr);
- 
-  format %{
-     "cmpxchgw_acq_shenandoah_narrow_oop $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
-  %}
- 
+   effect(TEMP_DEF res, TEMP tmp, KILL cr);
+   format %{
+     "cmpxchg_N_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval"
+   %}
    ins_encode %{
-     Register tmp = $tmp$$Register;
-     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-     ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register, /*acquire*/ true, /*release*/ true, /*is_cae*/ false, $res$$Register);
+     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
+ 
+     ShenandoahBarrierSet::assembler()->compare_and_set_c2(this, masm,
+       $res$$Register,
+       $mem$$base$$Register,
+       $oldval$$Register,
+       $newval$$Register,
+       $tmp$$Register,
+       /* exchange */ false,
+       /* maybe_null */ true,
+       /* is_narrow */ true,
+       /* weak */ false);
    %}
  
    ins_pipe(pipe_slow);
  %}
  
- instruct compareAndExchangeN_shenandoah(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
-   match(Set res (ShenandoahCompareAndExchangeN mem (Binary oldval newval)));
-   ins_cost(2 * VOLATILE_REF_COST);
+ instruct compareAndExchange_N_shenandoah(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set res (CompareAndExchangeN mem (Binary oldval newval)));
+   predicate(UseShenandoahGC && n->as_LoadStore()->barrier_data() != 0);
+   ins_cost(2*VOLATILE_REF_COST);
    effect(TEMP_DEF res, TEMP tmp, KILL cr);
    format %{
-     "cmpxchgw_shenandoah $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval"
+     "cae_N_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval"
    %}
    ins_encode %{
-     Register tmp = $tmp$$Register;
-     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-     ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
-                                                    /*acquire*/ false, /*release*/ true, /*is_cae*/ true, $res$$Register);
+     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
+ 
+     ShenandoahBarrierSet::assembler()->compare_and_set_c2(this, masm,
+       $res$$Register,
+       $mem$$base$$Register,
+       $oldval$$Register,
+       $newval$$Register,
+       $tmp$$Register,
+       /* exchange */ true,
+       /* maybe_null */ (this->bottom_type()->make_ptr()->ptr() != TypePtr::NotNull),
+       /* is_narrow */ true,
+       /* weak */ false);
    %}
    ins_pipe(pipe_slow);
  %}
  
- instruct compareAndExchangeP_shenandoah(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
-   match(Set res (ShenandoahCompareAndExchangeP mem (Binary oldval newval)));
-   ins_cost(2 * VOLATILE_REF_COST);
+ instruct compareAndExchange_P_shenandoah(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set res (CompareAndExchangeP mem (Binary oldval newval)));
+   predicate(UseShenandoahGC && n->as_LoadStore()->barrier_data() != 0);
+   ins_cost(2*VOLATILE_REF_COST);
    effect(TEMP_DEF res, TEMP tmp, KILL cr);
    format %{
-     "cmpxchg_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
+     "cae_P_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval"
    %}
    ins_encode %{
-     Register tmp = $tmp$$Register;
-     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-     ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
-                                                    /*acquire*/ false, /*release*/ true, /*is_cae*/ true, $res$$Register);
+     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
+ 
+     ShenandoahBarrierSet::assembler()->compare_and_set_c2(this, masm,
+       $res$$Register,
+       $mem$$base$$Register,
+       $oldval$$Register,
+       $newval$$Register,
+       $tmp$$Register,
+       /* exchange */ true,
+       /* maybe_null */ (this->bottom_type()->make_ptr()->ptr() != TypePtr::NotNull),
+       /* is_narrow */ false,
+       /* weak */ false);
    %}
    ins_pipe(pipe_slow);
  %}
  
- instruct compareAndExchangeNAcq_shenandoah(iRegNNoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
-   predicate(needs_acquiring_load_exclusive(n));
-   match(Set res (ShenandoahCompareAndExchangeN mem (Binary oldval newval)));
+ instruct weakCompareAndSwap_N_shenandoah(iRegINoSp res, indirect mem, iRegNNoSp oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set res (WeakCompareAndSwapN mem (Binary oldval newval)));
+   predicate(UseShenandoahGC && n->as_LoadStore()->barrier_data() != 0);
    ins_cost(VOLATILE_REF_COST);
    effect(TEMP_DEF res, TEMP tmp, KILL cr);
    format %{
-     "cmpxchgw_acq_shenandoah $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval"
+     "cae_N_weak_shenandoah $res = $mem, $oldval, $newval\t# (N, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+     "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
    %}
    ins_encode %{
-     Register tmp = $tmp$$Register;
-     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-     ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
-                                                    /*acquire*/ true, /*release*/ true, /*is_cae*/ true, $res$$Register);
+     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
+ 
+     ShenandoahBarrierSet::assembler()->compare_and_set_c2(this, masm,
+       $res$$Register,
+       $mem$$base$$Register,
+       $oldval$$Register,
+       $newval$$Register,
+       $tmp$$Register,
+       /* exchange */ false,
+       /* maybe_null */ true,
+       /* is_narrow */ true,
+       /* weak */ true);
    %}
    ins_pipe(pipe_slow);
  %}
  
- instruct compareAndExchangePAcq_shenandoah(iRegPNoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
-   predicate(needs_acquiring_load_exclusive(n));
-   match(Set res (ShenandoahCompareAndExchangeP mem (Binary oldval newval)));
+ instruct weakCompareAndSwap_P_shenandoah(iRegINoSp res, indirect mem, iRegPNoSp oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set res (WeakCompareAndSwapP mem (Binary oldval newval)));
+   predicate(UseShenandoahGC && n->as_LoadStore()->barrier_data() != 0);
    ins_cost(VOLATILE_REF_COST);
    effect(TEMP_DEF res, TEMP tmp, KILL cr);
    format %{
-     "cmpxchg_acq_shenandoah $mem, $oldval, $newval\t# (ptr) if $mem == $oldval then $mem <-- $newval with temp $tmp"
+     "cae_P_weak_shenandoah $res = $mem, $oldval, $newval\t# (P, weak) if $mem == $oldval then $mem <-- $newval\n\t"
+     "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
    %}
    ins_encode %{
-     Register tmp = $tmp$$Register;
-     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-     ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
-                                                    /*acquire*/ true, /*release*/ true, /*is_cae*/ true, $res$$Register);
+     guarantee($mem$$index == -1 && $mem$$disp == 0, "impossible encoding");
+ 
+     ShenandoahBarrierSet::assembler()->compare_and_set_c2(this, masm,
+       $res$$Register,
+       $mem$$base$$Register,
+       $oldval$$Register,
+       $newval$$Register,
+       $tmp$$Register,
+       /* exchange */ false,
+       /* maybe_null */ true,
+       /* is_narrow */ false,
+       /* weak */ true);
    %}
    ins_pipe(pipe_slow);
  %}
  
- instruct weakCompareAndSwapN_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
-   match(Set res (ShenandoahWeakCompareAndSwapN mem (Binary oldval newval)));
-   ins_cost(2 * VOLATILE_REF_COST);
-   effect(TEMP tmp, KILL cr);
-   format %{
-     "cmpxchgw_shenandoah $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval"
-     "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
-   %}
+ instruct getAndSet_P_shenandoah(indirect mem, iRegP newval, iRegPNoSp preval, iRegPNoSp tmp,  rFlagsReg cr)
+ %{
+   match(Set preval (GetAndSetP mem newval));
+   predicate(UseShenandoahGC && n->as_LoadStore()->barrier_data() != 0);
+   effect(TEMP_DEF preval, TEMP tmp, KILL cr);
+   ins_cost(2*VOLATILE_REF_COST);
+   format %{ "get_and_set_P $preval, $newval, [$mem]" %}
    ins_encode %{
-     Register tmp = $tmp$$Register;
-     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-     // Weak is not currently supported by ShenandoahBarrierSet::cmpxchg_oop
-     ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
-                                                    /*acquire*/ false, /*release*/ true, /*is_cae*/ false, $res$$Register);
+     ShenandoahBarrierSet::assembler()->get_and_set_c2(this, masm,
+       $preval$$Register,
+       $newval$$Register,
+       $mem$$Register,
+       $tmp$$Register);
    %}
-   ins_pipe(pipe_slow);
+   ins_pipe(pipe_serial);
  %}
  
- instruct weakCompareAndSwapP_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
-   match(Set res (ShenandoahWeakCompareAndSwapP mem (Binary oldval newval)));
-   ins_cost(2 * VOLATILE_REF_COST);
-   effect(TEMP tmp, KILL cr);
-   format %{
-     "cmpxchg_shenandoah $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval"
-   %}
+ instruct getAndSet_N_shenandoah(indirect mem, iRegN newval, iRegNNoSp preval, iRegNNoSp tmp, rFlagsReg cr)
+ %{
+   match(Set preval (GetAndSetN mem newval));
+   predicate(UseShenandoahGC && n->as_LoadStore()->barrier_data() != 0);
+   effect(TEMP_DEF preval, TEMP tmp, KILL cr);
+   ins_cost(2*VOLATILE_REF_COST);
+   format %{ "get_and_set_N $preval, $newval, [$mem]" %}
    ins_encode %{
-     Register tmp = $tmp$$Register;
-     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-     // Weak is not currently supported by ShenandoahBarrierSet::cmpxchg_oop
-     ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
-                                                    /*acquire*/ false, /*release*/ true, /*is_cae*/ false, $res$$Register);
+     ShenandoahBarrierSet::assembler()->get_and_set_c2(this, masm,
+       $preval$$Register,
+       $newval$$Register,
+       $mem$$Register,
+       $tmp$$Register);
    %}
-   ins_pipe(pipe_slow);
+   ins_pipe(pipe_serial);
  %}
  
- instruct weakCompareAndSwapNAcq_shenandoah(iRegINoSp res, indirect mem, iRegN oldval, iRegN newval, iRegNNoSp tmp, rFlagsReg cr) %{
-   predicate(needs_acquiring_load_exclusive(n));
-   match(Set res (ShenandoahWeakCompareAndSwapN mem (Binary oldval newval)));
-   ins_cost(VOLATILE_REF_COST);
-   effect(TEMP tmp, KILL cr);
-   format %{
-     "cmpxchgw_acq_shenandoah $res = $mem, $oldval, $newval\t# (narrow oop, weak) if $mem == $oldval then $mem <-- $newval"
-     "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+ instruct load_P_Normal_shenandoah(iRegPNoSp dst, memory8 mem, rFlagsReg cr)
+ %{
+   match(Set dst (LoadP mem));
+   predicate(UseShenandoahGC && !needs_acquiring_load(n) && n->as_Load()->barrier_data() != 0);
+   effect(TEMP_DEF dst, KILL cr);
+   // The main load is a candidate to implement implicit null checks.
+   ins_is_late_expanded_null_check_candidate(true);
+   format %{ "ldr  $dst, $mem\t# ptr" %}
+   ins_encode %{
+     Address addr = mem2address($mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
+     if (addr.getMode() == Address::base_plus_offset) {
+       addr = __ legitimize_address(addr, /* size_in_memory */ 8, rscratch1);
+     }
+     ShenandoahBarrierSet::assembler()->load_c2(this, masm, $dst$$Register, addr);
    %}
+   ins_cost(3*INSN_COST);
+   ins_pipe(pipe_class_memory);
+ %}
+ 
+ instruct load_P_Volatile_shenandoah(iRegPNoSp dst, indirect mem, rFlagsReg cr)
+ %{
+   match(Set dst (LoadP mem));
+   predicate(UseShenandoahGC && needs_acquiring_load(n) && n->as_Load()->barrier_data() != 0);
+   effect(TEMP_DEF dst, KILL cr);
+   // The main load is a candidate to implement implicit null checks.
+   ins_is_late_expanded_null_check_candidate(true);
+   format %{ "ldr  $dst, $mem\t# ptr" %}
    ins_encode %{
-     Register tmp = $tmp$$Register;
-     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-     // Weak is not currently supported by ShenandoahBarrierSet::cmpxchg_oop
-     ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
-                                                    /*acquire*/ true, /*release*/ true, /*is_cae*/ false, $res$$Register);
+     ShenandoahBarrierSet::assembler()->load_c2(this, masm, $dst$$Register, Address($mem$$Register));
    %}
-   ins_pipe(pipe_slow);
+   ins_cost(3*INSN_COST);
+   ins_pipe(pipe_class_memory);
  %}
  
- instruct weakCompareAndSwapPAcq_shenandoah(iRegINoSp res, indirect mem, iRegP oldval, iRegP newval, iRegPNoSp tmp, rFlagsReg cr) %{
-   predicate(needs_acquiring_load_exclusive(n));
-   match(Set res (ShenandoahWeakCompareAndSwapP mem (Binary oldval newval)));
-   ins_cost(VOLATILE_REF_COST);
-   effect(TEMP tmp, KILL cr);
-   format %{
-     "cmpxchg_acq_shenandoah $res = $mem, $oldval, $newval\t# (ptr, weak) if $mem == $oldval then $mem <-- $newval"
-     "csetw $res, EQ\t# $res <-- (EQ ? 1 : 0)"
+ instruct load_N_Normal_shenandoah(iRegNNoSp dst, memory4 mem, rFlagsReg cr)
+ %{
+   match(Set dst (LoadN mem));
+   predicate(UseShenandoahGC && !needs_acquiring_load(n) && n->as_Load()->barrier_data() != 0);
+   effect(TEMP_DEF dst, KILL cr);
+   // The main load is a candidate to implement implicit null checks.
+   ins_is_late_expanded_null_check_candidate(true);
+   format %{ "ldrw  $dst, $mem\t# ptr" %}
+   ins_encode %{
+     Address addr = mem2address($mem->opcode(), as_Register($mem$$base), $mem$$index, $mem$$scale, $mem$$disp);
+     if (addr.getMode() == Address::base_plus_offset) {
+       addr = __ legitimize_address(addr, /* size_in_memory */ 4, rscratch1);
+     }
+     ShenandoahBarrierSet::assembler()->load_c2(this, masm, $dst$$Register, addr);
    %}
+   ins_cost(3*INSN_COST);
+   ins_pipe(pipe_class_memory);
+ %}
+ 
+ instruct load_N_Volatile_shenandoah(iRegNNoSp dst, indirect mem, rFlagsReg cr)
+ %{
+   match(Set dst (LoadN mem));
+   predicate(UseShenandoahGC && needs_acquiring_load(n) && n->as_Load()->barrier_data() != 0);
+   effect(TEMP_DEF dst, KILL cr);
+   // The main load is a candidate to implement implicit null checks.
+   ins_is_late_expanded_null_check_candidate(true);
+   format %{ "ldrw  $dst, $mem\t# ptr" %}
    ins_encode %{
-     Register tmp = $tmp$$Register;
-     __ mov(tmp, $oldval$$Register); // Must not clobber oldval.
-     // Weak is not currently supported by ShenandoahBarrierSet::cmpxchg_oop
-     ShenandoahBarrierSet::assembler()->cmpxchg_oop(masm, $mem$$Register, tmp, $newval$$Register,
-                                                    /*acquire*/ true, /*release*/ true, /*is_cae*/ false, $res$$Register);
+     ShenandoahBarrierSet::assembler()->load_c2(this, masm, $dst$$Register, Address($mem$$Register));
    %}
-   ins_pipe(pipe_slow);
+   ins_cost(VOLATILE_REF_COST);
+   ins_pipe(pipe_class_memory);
  %}
+ 
< prev index next >