src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.hpp

@@ -1,7 +1,8 @@
  /*
   * Copyright (c) 2013, 2021, Red Hat, Inc. All rights reserved.
+  * Copyright Amazon.com Inc. 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.

@@ -28,26 +29,32 @@
  #include "gc/shared/barrierSet.hpp"
  #include "gc/shenandoah/shenandoahSATBMarkQueueSet.hpp"
  
  class ShenandoahHeap;
  class ShenandoahBarrierSetAssembler;
+ class ShenandoahCardTable;
  
  class ShenandoahBarrierSet: public BarrierSet {
  private:
    ShenandoahHeap* const _heap;
+   ShenandoahCardTable* _card_table;
    BufferNode::Allocator _satb_mark_queue_buffer_allocator;
    ShenandoahSATBMarkQueueSet _satb_mark_queue_set;
  
  public:
-   ShenandoahBarrierSet(ShenandoahHeap* heap);
+   ShenandoahBarrierSet(ShenandoahHeap* heap, MemRegion heap_region);
  
    static ShenandoahBarrierSetAssembler* assembler();
  
    inline static ShenandoahBarrierSet* barrier_set() {
      return barrier_set_cast<ShenandoahBarrierSet>(BarrierSet::barrier_set());
    }
  
+   inline ShenandoahCardTable* card_table() {
+     return _card_table;
+   }
+ 
    static ShenandoahSATBMarkQueueSet& satb_mark_queue_set() {
      return barrier_set()->_satb_mark_queue_set;
    }
  
    static bool need_load_reference_barrier(DecoratorSet decorators, BasicType type);

@@ -86,11 +93,10 @@
    static inline oop resolve_forwarded(oop p);
  
    template <DecoratorSet decorators, typename T>
    inline void satb_barrier(T* field);
    inline void satb_enqueue(oop value);
-   inline void iu_barrier(oop obj);
  
    inline void keep_alive_if_weak(DecoratorSet decorators, oop value);
  
    inline void enqueue(oop obj);
  

@@ -109,19 +115,23 @@
    inline oop oop_cmpxchg(DecoratorSet decorators, T* addr, oop compare_value, oop new_value);
  
    template <typename T>
    inline oop oop_xchg(DecoratorSet decorators, T* addr, oop new_value);
  
+   template <DecoratorSet decorators, typename T>
+   void write_ref_field_post(T* field);
+ 
+   void write_ref_array(HeapWord* start, size_t count);
+ 
  private:
    template <class T>
-   inline void arraycopy_marking(T* src, T* dst, size_t count);
+   inline void arraycopy_marking(T* src, T* dst, size_t count, bool is_old_marking);
    template <class T>
    inline void arraycopy_evacuation(T* src, size_t count);
    template <class T>
    inline void arraycopy_update(T* src, size_t count);
  
-   inline void clone_marking(oop src);
    inline void clone_evacuation(oop src);
    inline void clone_update(oop src);
  
    template <class T, bool HAS_FWD, bool EVAC, bool ENQUEUE>
    inline void arraycopy_work(T* src, size_t count);