src/cpu/arm/vm/c1_Runtime1_arm.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2008, 2016, Oracle and/or its affiliates. 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
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2008, 2017, Oracle and/or its affiliates. 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
   * published by the Free Software Foundation.
*** 549,566 ****
--- 549,573 ----
  
          const Register r_pre_val_0  = R0; // must be R0, to be ready for the runtime call
          const Register r_index_1    = R1;
          const Register r_buffer_2   = R2;
  
+         Address queue_active(Rthread, in_bytes(JavaThread::satb_mark_queue_offset() +
+                                                SATBMarkQueue::byte_offset_of_active()));
          Address queue_index(Rthread, in_bytes(JavaThread::satb_mark_queue_offset() +
                                                SATBMarkQueue::byte_offset_of_index()));
          Address buffer(Rthread, in_bytes(JavaThread::satb_mark_queue_offset() +
                                           SATBMarkQueue::byte_offset_of_buf()));
  
          Label done;
          Label runtime;
  
+         // Is marking still active?
+         assert(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "adjust this code");
+         __ ldrb(R1, queue_active);
+         __ cbz(R1, done);
+ 
          __ ldr(r_index_1, queue_index);
          __ ldr(r_pre_val_0, Address(SP, nb_saved_regs*wordSize));
          __ ldr(r_buffer_2, buffer);
  
          __ subs(r_index_1, r_index_1, wordSize);