src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp

rev 51332 : 8209118: Abstract SATBMarkQueueSet's ThreadLocalData access
rev 51333 : [mq]: JDK-8209118-01.patch

*** 28,37 ****
--- 28,38 ----
  #include "registerSaver_s390.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1BarrierSetAssembler.hpp"
  #include "gc/g1/g1BarrierSetRuntime.hpp"
+ #include "gc/g1/g1SATBMarkQueueSet.hpp"
  #include "gc/g1/g1ThreadLocalData.hpp"
  #include "gc/g1/heapRegion.hpp"
  #include "interpreter/interp_masm.hpp"
  #include "runtime/sharedRuntime.hpp"
  #ifdef COMPILER1
*** 518,528 ****
    __ z_br(Z_R14);
  
    __ bind(refill);
    save_volatile_registers(sasm);
    __ z_lgr(tmp, pre_val); // save pre_val
!   __ call_VM_leaf(CAST_FROM_FN_PTR(address, SATBMarkQueueSet::handle_zero_index_for_thread),
                    Z_thread);
    __ z_lgr(pre_val, tmp); // restore pre_val
    restore_volatile_registers(sasm);
    __ z_bru(restart);
  }
--- 519,529 ----
    __ z_br(Z_R14);
  
    __ bind(refill);
    save_volatile_registers(sasm);
    __ z_lgr(tmp, pre_val); // save pre_val
!   __ call_VM_leaf(CAST_FROM_FN_PTR(address, G1SATBMarkQueueSet::handle_zero_index_for_thread),
                    Z_thread);
    __ z_lgr(pre_val, tmp); // restore pre_val
    restore_volatile_registers(sasm);
    __ z_bru(restart);
  }