src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
   * Copyright (c) 2014, Red Hat Inc. 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) 2014, Red Hat Inc. 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
*** 1177,1186 ****
--- 1177,1195 ----
                                          SATBMarkQueue::byte_offset_of_buf()));
  
          Label done;
          Label runtime;
  
+         // Is marking still active?
+         if (in_bytes(SATBMarkQueue::byte_width_of_active()) == 4) {
+           __ ldrw(tmp, in_progress);
+         } else {
+           assert(in_bytes(SATBMarkQueue::byte_width_of_active()) == 1, "Assumption");
+           __ ldrb(tmp, in_progress);
+         }
+         __ cbzw(tmp, done);
+ 
          // Can we store original value in the thread's buffer?
          __ ldr(tmp, queue_index);
          __ cbz(tmp, runtime);
  
          __ sub(tmp, tmp, wordSize);