src/hotspot/cpu/aarch64/gc/shenandoah/shenandoahBarrierSetAssembler_aarch64.cpp

rev 58671 : 8242130: Shenandoah: Simplify arraycopy-barrier dispatching
rev 58672 : Shenandoah: New incremental-update mode

*** 47,87 ****
  
  void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
                                                         Register src, Register dst, Register count, RegSet saved_regs) {
    if (is_oop) {
      bool dest_uninitialized = (decorators & IS_DEST_UNINITIALIZED) != 0;
!     if ((ShenandoahSATBBarrier && !dest_uninitialized) || ShenandoahLoadRefBarrier) {
  
        Label done;
  
        // Avoid calling runtime if count == 0
        __ cbz(count, done);
  
!       // Is marking active?
        Address gc_state(rthread, in_bytes(ShenandoahThreadLocalData::gc_state_offset()));
        __ ldrb(rscratch1, gc_state);
!       if (dest_uninitialized) {
          __ tbz(rscratch1, ShenandoahHeap::HAS_FORWARDED_BITPOS, done);
        } else {
          __ mov(rscratch2, ShenandoahHeap::HAS_FORWARDED | ShenandoahHeap::MARKING);
          __ tst(rscratch1, rscratch2);
          __ br(Assembler::EQ, done);
        }
  
        __ push(saved_regs, sp);
        if (UseCompressedOops) {
!         if (dest_uninitialized) {
!           __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_array_pre_duinit_narrow_oop_entry), src, dst, count);
          } else {
!           __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_array_pre_narrow_oop_entry), src, dst, count);
!         }
!       } else {
!         if (dest_uninitialized) {
!           __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_array_pre_duinit_oop_entry), src, dst, count);
!         } else {
!           __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::write_ref_array_pre_oop_entry), src, dst, count);
!         }
        }
        __ pop(saved_regs, sp);
        __ bind(done);
      }
    }
--- 47,79 ----
  
  void ShenandoahBarrierSetAssembler::arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
                                                         Register src, Register dst, Register count, RegSet saved_regs) {
    if (is_oop) {
      bool dest_uninitialized = (decorators & IS_DEST_UNINITIALIZED) != 0;
!     if ((ShenandoahSATBBarrier && !dest_uninitialized) || ShenandoahStoreValEnqueueBarrier || ShenandoahLoadRefBarrier) {
  
        Label done;
  
        // Avoid calling runtime if count == 0
        __ cbz(count, done);
  
!       // Is GC active?
        Address gc_state(rthread, in_bytes(ShenandoahThreadLocalData::gc_state_offset()));
        __ ldrb(rscratch1, gc_state);
!       if (dest_uninitialized && !ShenandoahStoreValEnqueueBarrier) {
          __ tbz(rscratch1, ShenandoahHeap::HAS_FORWARDED_BITPOS, done);
        } else {
          __ mov(rscratch2, ShenandoahHeap::HAS_FORWARDED | ShenandoahHeap::MARKING);
          __ tst(rscratch1, rscratch2);
          __ br(Assembler::EQ, done);
        }
  
        __ push(saved_regs, sp);
        if (UseCompressedOops) {
!         __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_narrow_oop_entry), src, dst, count);
        } else {
!         __ call_VM_leaf(CAST_FROM_FN_PTR(address, ShenandoahRuntime::arraycopy_barrier_oop_entry), src, dst, count);
        }
        __ pop(saved_regs, sp);
        __ bind(done);
      }
    }