src/hotspot/cpu/arm/gc/g1/g1BarrierSetAssembler_arm.cpp

rename things

*** 23,33 ****
   */
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
! #include "gc/g1/g1BarrierSetCodeGen.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/heapRegion.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "interpreter/interp_masm.hpp"
  #include "runtime/sharedRuntime.hpp"
--- 23,33 ----
   */
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
! #include "gc/g1/g1BarrierSetAssembler.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/heapRegion.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "interpreter/interp_masm.hpp"
  #include "runtime/sharedRuntime.hpp"
***************
*** 42,53 ****
  #define BLOCK_COMMENT(str) __ block_comment(str)
  #endif
  
  #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
  
! void G1BarrierSetCodeGen::gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
!                                                           Register addr, Register count, int callee_saved_regs) {
    bool dest_uninitialized = (decorators & AS_DEST_NOT_INITIALIZED) != 0;
    if (!dest_uninitialized) {
      assert( addr->encoding() < callee_saved_regs, "addr must be saved");
      assert(count->encoding() < callee_saved_regs, "count must be saved");
  
--- 42,53 ----
  #define BLOCK_COMMENT(str) __ block_comment(str)
  #endif
  
  #define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
  
! void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators,
!                                                             Register addr, Register count, int callee_saved_regs) {
    bool dest_uninitialized = (decorators & AS_DEST_NOT_INITIALIZED) != 0;
    if (!dest_uninitialized) {
      assert( addr->encoding() < callee_saved_regs, "addr must be saved");
      assert(count->encoding() < callee_saved_regs, "count must be saved");
  
***************
*** 89,100 ****
      __ pop(saved_regs | R9ifScratched);
  #endif // AARCH64
    }
  }
  
! void G1BarrierSetCodeGen::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
!                                                            Register addr, Register count, Register tmp) {
  
    BLOCK_COMMENT("G1PostBarrier");
    if (addr != R0) {
      assert_different_registers(count, R0);
      __ mov(R0, addr);
--- 89,100 ----
      __ pop(saved_regs | R9ifScratched);
  #endif // AARCH64
    }
  }
  
! void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
!                                                              Register addr, Register count, Register tmp) {
  
    BLOCK_COMMENT("G1PostBarrier");
    if (addr != R0) {
      assert_different_registers(count, R0);
      __ mov(R0, addr);