src/hotspot/cpu/sparc/c1_Runtime1_sparc.cpp

*** 41,50 ****
--- 41,51 ----
  #include "utilities/align.hpp"
  #include "vmreg_sparc.inline.hpp"
  #if INCLUDE_ALL_GCS
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CardTable.hpp"
+ #include "gc/g1/g1ThreadLocalData.hpp"
  #endif
  
  // Implementation of StubAssembler
  
  int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry_point, int number_of_arguments) {
*** 775,793 ****
          Register pre_val = G4;
          Register tmp  = G1_scratch;
          Register tmp2 = G3_scratch;
  
          Label refill, restart;
!         int satb_q_active_byte_offset =
!           in_bytes(JavaThread::satb_mark_queue_offset() +
!                    SATBMarkQueue::byte_offset_of_active());
!         int satb_q_index_byte_offset =
!           in_bytes(JavaThread::satb_mark_queue_offset() +
!                    SATBMarkQueue::byte_offset_of_index());
!         int satb_q_buf_byte_offset =
!           in_bytes(JavaThread::satb_mark_queue_offset() +
!                    SATBMarkQueue::byte_offset_of_buf());
  
          // Is marking still active?
          if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {
            __ ld(G2_thread, satb_q_active_byte_offset, tmp);
          } else {
--- 776,788 ----
          Register pre_val = G4;
          Register tmp  = G1_scratch;
          Register tmp2 = G3_scratch;
  
          Label refill, restart;
!         int satb_q_active_byte_offset = in_bytes(G1ThreadLocalData::satb_mark_queue_active_offset());
!         int satb_q_index_byte_offset = in_bytes(G1ThreadLocalData::satb_mark_queue_index_offset());
!         int satb_q_buf_byte_offset = in_bytes(G1ThreadLocalData::satb_mark_queue_buffer_offset());
  
          // Is marking still active?
          if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {
            __ ld(G2_thread, satb_q_active_byte_offset, tmp);
          } else {
*** 884,899 ****
          Register tmp4 = tmp;
  
          // these registers are now dead
          addr = cardtable = tmp = noreg;
  
!         int dirty_card_q_index_byte_offset =
!           in_bytes(JavaThread::dirty_card_queue_offset() +
!                    DirtyCardQueue::byte_offset_of_index());
!         int dirty_card_q_buf_byte_offset =
!           in_bytes(JavaThread::dirty_card_queue_offset() +
!                    DirtyCardQueue::byte_offset_of_buf());
  
          __ bind(restart);
  
          // Get the index into the update buffer. DirtyCardQueue::_index is
          // a size_t so ld_ptr is appropriate here.
--- 879,890 ----
          Register tmp4 = tmp;
  
          // these registers are now dead
          addr = cardtable = tmp = noreg;
  
!         int dirty_card_q_index_byte_offset = in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset());
!         int dirty_card_q_buf_byte_offset = in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset());
  
          __ bind(restart);
  
          // Get the index into the update buffer. DirtyCardQueue::_index is
          // a size_t so ld_ptr is appropriate here.