src/share/vm/runtime/vmStructs.cpp

*** 171,180 ****
--- 171,181 ----
  #include "gc_implementation/parallelScavenge/psOldGen.hpp"
  #include "gc_implementation/parallelScavenge/psVirtualspace.hpp"
  #include "gc_implementation/parallelScavenge/psYoungGen.hpp"
  #include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp"
  #include "gc_implementation/g1/vmStructs_g1.hpp"
+ #include "gc_implementation/shenandoah/vmStructs_shenandoah.hpp"
  #endif // INCLUDE_ALL_GCS
  
  #ifdef COMPILER2
  #include "opto/addnode.hpp"
  #include "opto/block.hpp"
*** 2221,2230 ****
--- 2222,2232 ----
    declare_constant(BarrierSet::ModRef)                                    \
    declare_constant(BarrierSet::CardTableModRef)                           \
    declare_constant(BarrierSet::CardTableExtension)                        \
    declare_constant(BarrierSet::G1SATBCT)                                  \
    declare_constant(BarrierSet::G1SATBCTLogging)                           \
+   declare_constant(BarrierSet::ShenandoahBarrierSet)                      \
    declare_constant(BarrierSet::Other)                                     \
                                                                            \
    declare_constant(BlockOffsetSharedArray::LogN)                          \
    declare_constant(BlockOffsetSharedArray::LogN_words)                    \
    declare_constant(BlockOffsetSharedArray::N_bytes)                       \
*** 2244,2253 ****
--- 2246,2256 ----
    declare_constant(CardTableRS::youngergen_card)                          \
                                                                            \
    declare_constant(CollectedHeap::Abstract)                               \
    declare_constant(CollectedHeap::SharedHeap)                             \
    declare_constant(CollectedHeap::GenCollectedHeap)                       \
+   declare_constant(CollectedHeap::ShenandoahHeap)                         \
                                                                            \
    declare_constant(GenCollectedHeap::max_gens)                            \
                                                                            \
    /* constants from Generation::Name enum */                              \
                                                                            \
*** 2921,2930 ****
--- 2924,2938 ----
                   GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                   GENERATE_STATIC_VM_STRUCT_ENTRY)
  
    VM_STRUCTS_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                  GENERATE_STATIC_VM_STRUCT_ENTRY)
+ 
+   VM_STRUCTS_SHENANDOAH(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
+                         GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
+                         GENERATE_STATIC_VM_STRUCT_ENTRY)
+ 
  #endif // INCLUDE_ALL_GCS
  
    VM_STRUCTS_CPU(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                   GENERATE_STATIC_VM_STRUCT_ENTRY,
                   GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
*** 2966,2975 ****
--- 2974,2987 ----
  
    VM_TYPES_PARNEW(GENERATE_VM_TYPE_ENTRY)
  
    VM_TYPES_G1(GENERATE_VM_TYPE_ENTRY,
                GENERATE_TOPLEVEL_VM_TYPE_ENTRY)
+ 
+   VM_TYPES_SHENANDOAH(GENERATE_VM_TYPE_ENTRY,
+               GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
+               GENERATE_INTEGER_VM_TYPE_ENTRY)
  #endif // INCLUDE_ALL_GCS
  
    VM_TYPES_CPU(GENERATE_VM_TYPE_ENTRY,
                 GENERATE_TOPLEVEL_VM_TYPE_ENTRY,
                 GENERATE_OOP_VM_TYPE_ENTRY,
*** 3001,3010 ****
--- 3013,3025 ----
  
  #if INCLUDE_ALL_GCS
    VM_INT_CONSTANTS_CMS(GENERATE_VM_INT_CONSTANT_ENTRY)
  
    VM_INT_CONSTANTS_PARNEW(GENERATE_VM_INT_CONSTANT_ENTRY)
+ 
+   VM_INT_CONSTANTS_SHENANDOAH(GENERATE_VM_INT_CONSTANT_ENTRY,
+                               GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY)
  #endif // INCLUDE_ALL_GCS
  
    VM_INT_CONSTANTS_CPU(GENERATE_VM_INT_CONSTANT_ENTRY,
                         GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
                         GENERATE_C1_VM_INT_CONSTANT_ENTRY,
*** 3067,3076 ****
--- 3082,3095 ----
               CHECK_STATIC_VM_STRUCT_ENTRY);
  
    VM_STRUCTS_G1(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
                  CHECK_STATIC_VM_STRUCT_ENTRY);
  
+ 
+   VM_STRUCTS_SHENANDOAH(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
+                         CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY,
+                         CHECK_STATIC_VM_STRUCT_ENTRY);
  #endif // INCLUDE_ALL_GCS
  
    VM_STRUCTS_CPU(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
                   CHECK_STATIC_VM_STRUCT_ENTRY,
                   CHECK_NO_OP,
*** 3108,3117 ****
--- 3127,3139 ----
    VM_TYPES_PARNEW(CHECK_VM_TYPE_ENTRY)
  
    VM_TYPES_G1(CHECK_VM_TYPE_ENTRY,
                CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
  
+   VM_TYPES_SHENANDOAH(CHECK_VM_TYPE_ENTRY,
+                       CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
+                       CHECK_SINGLE_ARG_VM_TYPE_NO_OP);
  #endif // INCLUDE_ALL_GCS
  
    VM_TYPES_CPU(CHECK_VM_TYPE_ENTRY,
                 CHECK_SINGLE_ARG_VM_TYPE_NO_OP,
                 CHECK_SINGLE_ARG_VM_TYPE_NO_OP,