src/hotspot/cpu/ppc/gc/g1/g1BarrierSetAssembler_ppc.cpp

*** 26,35 ****
--- 26,36 ----
  #include "precompiled.hpp"
  #include "asm/macroAssembler.inline.hpp"
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/g1BarrierSetAssembler.hpp"
+ #include "gc/g1/g1ThreadLocalData.hpp"
  #include "gc/g1/heapRegion.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "runtime/thread.hpp"
  #include "interpreter/interp_masm.hpp"
  
*** 47,60 ****
      const int frame_size = align_up(frame::abi_reg_args_size + spill_slots * BytesPerWord, frame::alignment_in_bytes);
      Label filtered;
  
      // Is marking active?
      if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {
!       __ lwz(R0, in_bytes(JavaThread::satb_mark_queue_offset() + SATBMarkQueue::byte_offset_of_active()), R16_thread);
      } else {
        guarantee(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "Assumption");
!       __ lbz(R0, in_bytes(JavaThread::satb_mark_queue_offset() + SATBMarkQueue::byte_offset_of_active()), R16_thread);
      }
      __ cmpdi(CCR0, R0, 0);
      __ beq(CCR0, filtered);
  
      __ save_LR_CR(R0);
--- 48,61 ----
      const int frame_size = align_up(frame::abi_reg_args_size + spill_slots * BytesPerWord, frame::alignment_in_bytes);
      Label filtered;
  
      // Is marking active?
      if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {
!       __ lwz(R0, in_bytes(G1ThreadLocalData::satb_mark_queue_active_offset()), R16_thread);
      } else {
        guarantee(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "Assumption");
!       __ lbz(R0, in_bytes(G1ThreadLocalData::satb_mark_queue_active_offset()), R16_thread);
      }
      __ cmpdi(CCR0, R0, 0);
      __ beq(CCR0, filtered);
  
      __ save_LR_CR(R0);