src/share/vm/jvmci/vmStructs_jvmci.cpp

rev 12906 : [mq]: gc_interface

*** 38,48 ****
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/thread.hpp"
  #include "runtime/vm_version.hpp"
  
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc/g1/heapRegion.hpp"
  #endif
  
  #define VM_STRUCTS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field) \
    static_field(CompilerToVM::Data,             Klass_vtable_start_offset,              int)                                          \
--- 38,49 ----
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/thread.hpp"
  #include "runtime/vm_version.hpp"
  
  #if INCLUDE_ALL_GCS
! #include "gc/g1/g1BarrierSet.hpp"
! #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/heapRegion.hpp"
  #endif
  
  #define VM_STRUCTS(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field) \
    static_field(CompilerToVM::Data,             Klass_vtable_start_offset,              int)                                          \
*** 418,428 ****
                                                                            \
    declare_constant(BitData::exception_seen_flag)                          \
    declare_constant(BitData::null_seen_flag)                               \
    declare_constant(BranchData::not_taken_off_set)                         \
                                                                            \
!   declare_constant_with_value("CardTableModRefBS::dirty_card", CardTableModRefBS::dirty_card_val()) \
                                                                            \
    declare_constant(CodeInstaller::VERIFIED_ENTRY)                         \
    declare_constant(CodeInstaller::UNVERIFIED_ENTRY)                       \
    declare_constant(CodeInstaller::OSR_ENTRY)                              \
    declare_constant(CodeInstaller::EXCEPTION_HANDLER_ENTRY)                \
--- 419,429 ----
                                                                            \
    declare_constant(BitData::exception_seen_flag)                          \
    declare_constant(BitData::null_seen_flag)                               \
    declare_constant(BranchData::not_taken_off_set)                         \
                                                                            \
!   declare_constant_with_value("CardTable::dirty_card", CardTable::dirty_card_val()) \
                                                                            \
    declare_constant(CodeInstaller::VERIFIED_ENTRY)                         \
    declare_constant(CodeInstaller::UNVERIFIED_ENTRY)                       \
    declare_constant(CodeInstaller::OSR_ENTRY)                              \
    declare_constant(CodeInstaller::EXCEPTION_HANDLER_ENTRY)                \
*** 643,653 ****
  
  #define VM_STRUCTS_G1(nonstatic_field, static_field) \
    static_field(HeapRegion, LogOfHRGrainBytes, int)
  
  #define VM_INT_CONSTANTS_G1(declare_constant, declare_constant_with_value, declare_preprocessor_constant) \
!   declare_constant_with_value("G1SATBCardTableModRefBS::g1_young_gen", G1SATBCardTableModRefBS::g1_young_card_val())
  
  #endif // INCLUDE_ALL_GCS
  
  
  #ifdef LINUX
--- 644,654 ----
  
  #define VM_STRUCTS_G1(nonstatic_field, static_field) \
    static_field(HeapRegion, LogOfHRGrainBytes, int)
  
  #define VM_INT_CONSTANTS_G1(declare_constant, declare_constant_with_value, declare_preprocessor_constant) \
!   declare_constant_with_value("G1CardTable::g1_young_gen", G1CardTable::g1_young_card_val())
  
  #endif // INCLUDE_ALL_GCS
  
  
  #ifdef LINUX