src/cpu/s390/vm/c1_Runtime1_s390.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2016 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) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2016 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
*** 782,792 ****
  
          Register pre_val = Z_R1_scratch;
          Register tmp  = Z_R6; // Must be non-volatile because it is used to save pre_val.
          Register tmp2 = Z_R7;
  
!         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() +
--- 782,795 ----
  
          Register pre_val = Z_R1_scratch;
          Register tmp  = Z_R6; // Must be non-volatile because it is used to save pre_val.
          Register tmp2 = Z_R7;
  
!         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() +
*** 794,803 ****
--- 797,815 ----
  
          // Save tmp registers (see assertion in G1PreBarrierStub::emit_code()).
          __ z_stg(tmp,  0*BytesPerWord + FrameMap::first_available_sp_in_frame, Z_SP);
          __ z_stg(tmp2, 1*BytesPerWord + FrameMap::first_available_sp_in_frame, Z_SP);
  
+         // Is marking still active?
+         if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {
+           __ load_and_test_int(tmp, Address(Z_thread, satb_q_active_byte_offset));
+         } else {
+           assert(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "Assumption");
+           __ load_and_test_byte(tmp, Address(Z_thread, satb_q_active_byte_offset));
+         }
+         __ z_bre(marking_not_active); // Activity indicator is zero, so there is no marking going on currently.
+ 
          __ bind(restart);
          // Load the index into the SATB buffer. SATBMarkQueue::_index is a
          // size_t so ld_ptr is appropriate.
          __ z_ltg(tmp, satb_q_index_byte_offset, Z_R0, Z_thread);
  
*** 808,817 ****
--- 820,830 ----
          __ add2reg(tmp, -oopSize);
  
          __ z_stg(pre_val, 0, tmp, tmp2); // [_buf + index] := <address_of_card>
          __ z_stg(tmp, satb_q_index_byte_offset, Z_thread);
  
+         __ bind(marking_not_active);
          // Restore tmp registers (see assertion in G1PreBarrierStub::emit_code()).
          __ z_lg(tmp,  0*BytesPerWord + FrameMap::first_available_sp_in_frame, Z_SP);
          __ z_lg(tmp2, 1*BytesPerWord + FrameMap::first_available_sp_in_frame, Z_SP);
          __ z_br(Z_R14);