src/cpu/x86/vm/c1_Runtime1_x86.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2015, 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) 1999, 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.
*** 1621,1638 ****
--- 1621,1649 ----
          const Register thread = NOT_LP64(rax) LP64_ONLY(r15_thread);
          const Register tmp = rdx;
  
          NOT_LP64(__ get_thread(thread);)
  
+         Address queue_active(thread, in_bytes(JavaThread::satb_mark_queue_offset() +
+                                               SATBMarkQueue::byte_offset_of_active()));
          Address queue_index(thread, in_bytes(JavaThread::satb_mark_queue_offset() +
                                               SATBMarkQueue::byte_offset_of_index()));
          Address buffer(thread, in_bytes(JavaThread::satb_mark_queue_offset() +
                                          SATBMarkQueue::byte_offset_of_buf()));
  
          Label done;
          Label runtime;
          
+         // Is marking still active?
+         if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {
+           __ cmpl(queue_active, 0);
+         } else {
+           assert(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "Assumption");
+           __ cmpb(queue_active, 0);
+         }
+         __ jcc(Assembler::equal, done);
+ 
          // Can we store original value in the thread's buffer?
  
          __ movptr(tmp, queue_index);
          __ testptr(tmp, tmp);
          __ jcc(Assembler::zero, runtime);