src/hotspot/cpu/x86/gc/shenandoah/shenandoahBarrierSetAssembler_x86.hpp

@@ -34,10 +34,13 @@
  class LIR_Assembler;
  class ShenandoahPreBarrierStub;
  class ShenandoahLoadReferenceBarrierStub;
  class StubAssembler;
  #endif
+ #ifdef COMPILER2
+ class MachNode;
+ #endif
  class StubCodeGenerator;
  
  class ShenandoahBarrierSetAssembler: public BarrierSetAssembler {
  private:
  

@@ -53,16 +56,10 @@
    void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                          Register addr, Register count,
                                          Register tmp);
  
  public:
- #ifdef COMPILER1
-   void gen_pre_barrier_stub(LIR_Assembler* ce, ShenandoahPreBarrierStub* stub);
-   void gen_load_reference_barrier_stub(LIR_Assembler* ce, ShenandoahLoadReferenceBarrierStub* stub);
-   void generate_c1_pre_barrier_runtime_stub(StubAssembler* sasm);
-   void generate_c1_load_reference_barrier_runtime_stub(StubAssembler* sasm, DecoratorSet decorators);
- #endif
  
    void load_reference_barrier(MacroAssembler* masm, Register dst, Address src, DecoratorSet decorators);
  
    void cmpxchg_oop(MacroAssembler* masm,
                     Register res, Address addr, Register oldval, Register newval,

@@ -75,8 +72,28 @@
                         Register dst, Address src, Register tmp1);
    virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type,
                          Address dst, Register val, Register tmp1, Register tmp2, Register tmp3);
    virtual void try_resolve_jobject_in_native(MacroAssembler* masm, Register jni_env,
                                               Register obj, Register tmp, Label& slowpath);
+ 
+ #ifdef COMPILER1
+   void gen_pre_barrier_stub(LIR_Assembler* ce, ShenandoahPreBarrierStub* stub);
+   void gen_load_reference_barrier_stub(LIR_Assembler* ce, ShenandoahLoadReferenceBarrierStub* stub);
+   void generate_c1_pre_barrier_runtime_stub(StubAssembler* sasm);
+   void generate_c1_load_reference_barrier_runtime_stub(StubAssembler* sasm, DecoratorSet decorators);
+ #endif
+ 
+ #ifdef COMPILER2
+   // Entry points from Matcher
+   void load_c2(const MachNode* node, MacroAssembler* masm, Register dst, Address src);
+   void store_c2(const MachNode* node, MacroAssembler* masm,
+                 Address dst, bool dst_narrow, Register src, bool src_narrow, Register tmp);
+   void cae_c2(const MachNode* node, MacroAssembler* masm, Register res, Address addr, Register oldval, Register newval,
+               Register tmp1, Register tmp2, bool exchange, bool maybe_null, bool narrow);
+   void get_and_set_c2(const MachNode* node, MacroAssembler* masm, Register newval, Address addr, Register tmp);
+ 
+   void gc_state_check_c2(MacroAssembler* masm, const char test_state, BarrierStubC2* slow_stub);
+   void card_barrier_c2(MacroAssembler* masm, Address dst, Register tmp);
+ #endif
  };
  
  #endif // CPU_X86_GC_SHENANDOAH_SHENANDOAHBARRIERSETASSEMBLER_X86_HPP