src/hotspot/share/jvmci/vmStructs_jvmci.cpp

rev 49911 : imported patch removeAllGCs

*** 38,49 ****
  #include "runtime/flags/jvmFlag.hpp"
  #include "runtime/globals.hpp"
  #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"
  #include "gc/g1/g1ThreadLocalData.hpp"
  #endif
--- 38,48 ----
  #include "runtime/flags/jvmFlag.hpp"
  #include "runtime/globals.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/thread.hpp"
  #include "runtime/vm_version.hpp"
! #if INCLUDE_G1GC
  #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CardTable.hpp"
  #include "gc/g1/heapRegion.hpp"
  #include "gc/g1/g1ThreadLocalData.hpp"
  #endif
*** 634,651 ****
    declare_function(JVMCIRuntime::log_primitive) \
    declare_function(JVMCIRuntime::log_object) \
    declare_function(JVMCIRuntime::log_printf) \
    declare_function(JVMCIRuntime::vm_error) \
    declare_function(JVMCIRuntime::load_and_clear_exception) \
!   ALL_GCS_ONLY(declare_function(JVMCIRuntime::write_barrier_pre)) \
!   ALL_GCS_ONLY(declare_function(JVMCIRuntime::write_barrier_post)) \
    declare_function(JVMCIRuntime::validate_object) \
    \
    declare_function(JVMCIRuntime::test_deoptimize_call_int)
  
  
! #if INCLUDE_ALL_GCS
  
  #define VM_STRUCTS_JVMCI_G1GC(nonstatic_field, static_field) \
    static_field(HeapRegion, LogOfHRGrainBytes, int)
  
  #define VM_INT_CONSTANTS_JVMCI_G1GC(declare_constant, declare_constant_with_value, declare_preprocessor_constant) \
--- 633,650 ----
    declare_function(JVMCIRuntime::log_primitive) \
    declare_function(JVMCIRuntime::log_object) \
    declare_function(JVMCIRuntime::log_printf) \
    declare_function(JVMCIRuntime::vm_error) \
    declare_function(JVMCIRuntime::load_and_clear_exception) \
!   G1GC_ONLY(declare_function(JVMCIRuntime::write_barrier_pre)) \
!   G1GC_ONLY(declare_function(JVMCIRuntime::write_barrier_post)) \
    declare_function(JVMCIRuntime::validate_object) \
    \
    declare_function(JVMCIRuntime::test_deoptimize_call_int)
  
  
! #if INCLUDE_G1GC
  
  #define VM_STRUCTS_JVMCI_G1GC(nonstatic_field, static_field) \
    static_field(HeapRegion, LogOfHRGrainBytes, int)
  
  #define VM_INT_CONSTANTS_JVMCI_G1GC(declare_constant, declare_constant_with_value, declare_preprocessor_constant) \
*** 654,664 ****
    declare_constant_with_value("G1ThreadLocalData::satb_mark_queue_index_offset", in_bytes(G1ThreadLocalData::satb_mark_queue_index_offset())) \
    declare_constant_with_value("G1ThreadLocalData::satb_mark_queue_buffer_offset", in_bytes(G1ThreadLocalData::satb_mark_queue_buffer_offset())) \
    declare_constant_with_value("G1ThreadLocalData::dirty_card_queue_index_offset", in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset())) \
    declare_constant_with_value("G1ThreadLocalData::dirty_card_queue_buffer_offset", in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset()))
  
! #endif // INCLUDE_ALL_GCS
  
  
  #ifdef LINUX
  
  #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
--- 653,663 ----
    declare_constant_with_value("G1ThreadLocalData::satb_mark_queue_index_offset", in_bytes(G1ThreadLocalData::satb_mark_queue_index_offset())) \
    declare_constant_with_value("G1ThreadLocalData::satb_mark_queue_buffer_offset", in_bytes(G1ThreadLocalData::satb_mark_queue_buffer_offset())) \
    declare_constant_with_value("G1ThreadLocalData::dirty_card_queue_index_offset", in_bytes(G1ThreadLocalData::dirty_card_queue_index_offset())) \
    declare_constant_with_value("G1ThreadLocalData::dirty_card_queue_buffer_offset", in_bytes(G1ThreadLocalData::dirty_card_queue_buffer_offset()))
  
! #endif // INCLUDE_G1GC
  
  
  #ifdef LINUX
  
  #define VM_ADDRESSES_OS(declare_address, declare_preprocessor_address, declare_function) \
*** 870,880 ****
                   GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
                   GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY,
                   GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
                   GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
  
! #if INCLUDE_ALL_GCS
    VM_STRUCTS_JVMCI_G1GC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                          GENERATE_STATIC_VM_STRUCT_ENTRY)
  #endif
  
    GENERATE_VM_STRUCT_LAST_ENTRY()
--- 869,879 ----
                   GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
                   GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY,
                   GENERATE_C1_UNCHECKED_STATIC_VM_STRUCT_ENTRY,
                   GENERATE_C2_UNCHECKED_STATIC_VM_STRUCT_ENTRY)
  
! #if INCLUDE_G1GC
    VM_STRUCTS_JVMCI_G1GC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
                          GENERATE_STATIC_VM_STRUCT_ENTRY)
  #endif
  
    GENERATE_VM_STRUCT_LAST_ENTRY()
*** 922,932 ****
                         GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
                         GENERATE_C1_VM_INT_CONSTANT_ENTRY,
                         GENERATE_C2_VM_INT_CONSTANT_ENTRY,
                         GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
  
! #if INCLUDE_ALL_GCS
    VM_INT_CONSTANTS_JVMCI_G1GC(GENERATE_VM_INT_CONSTANT_ENTRY,
                                GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY,
                                GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
  #endif
  
--- 921,931 ----
                         GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY,
                         GENERATE_C1_VM_INT_CONSTANT_ENTRY,
                         GENERATE_C2_VM_INT_CONSTANT_ENTRY,
                         GENERATE_C2_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
  
! #if INCLUDE_G1GC
    VM_INT_CONSTANTS_JVMCI_G1GC(GENERATE_VM_INT_CONSTANT_ENTRY,
                                GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY,
                                GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
  #endif