src/cpu/ppc/vm/c1_Runtime1_ppc.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
--- 1,7 ----
  /*
!  * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
*** 739,749 ****
          const int stack_slots = 3;
          Register pre_val = R0; // previous value of memory
          Register tmp  = R14;
          Register tmp2 = R15;
  
!         Label refill, restart;
          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() +
--- 739,753 ----
          const int stack_slots = 3;
          Register pre_val = R0; // previous value of memory
          Register tmp  = R14;
          Register tmp2 = R15;
  
!         Label refill, restart, marking_not_active;
!    
!         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() +
*** 751,760 ****
--- 755,774 ----
  
          // Spill
          __ std(tmp, -16, R1_SP);
          __ std(tmp2, -24, R1_SP);
  
+         // Is marking still active?
+         if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {
+           __ lwz(tmp, satb_q_active_byte_offset, R16_thread);
+         } else {
+           guarantee(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "Assumption");
+           __ lbz(tmp, satb_q_active_byte_offset, R16_thread);
+         }
+         __ cmpdi(CCR0, tmp, 0);
+         __ beq(CCR0, marking_not_active);
+ 
          __ bind(restart);
          // Load the index into the SATB buffer. SATBMarkQueue::_index is a
          // size_t so ld_ptr is appropriate.
          __ ld(tmp, satb_q_index_byte_offset, R16_thread);
  
*** 767,776 ****
--- 781,791 ----
          __ addi(tmp, tmp, -oopSize);
  
          __ std(tmp, satb_q_index_byte_offset, R16_thread);
          __ stdx(pre_val, tmp2, tmp); // [_buf + index] := <address_of_card>
  
+         __ bind(marking_not_active);
          // Restore temp registers and return-from-leaf.
          __ ld(tmp2, -24, R1_SP);
          __ ld(tmp, -16, R1_SP);
          __ blr();