open Udiff src/hotspot/share/jvmci/vmStructs_jvmci.cpp (original) (raw)
@@ -170,12 +170,12 @@
nonstatic_field(JavaThread, _vm_result, oop)
volatile_nonstatic_field(JavaThread, _exception_oop, oop)
volatile_nonstatic_field(JavaThread, _exception_pc, address)
volatile_nonstatic_field(JavaThread, _is_method_handle_return, int)
nonstatic_field(JavaThread, _osthread, OSThread*) \
- nonstatic_field(JavaThread, _satb_mark_queue, SATBMarkQueue) \
- nonstatic_field(JavaThread, _dirty_card_queue, DirtyCardQueue) \
- ALL_GCS_ONLY(nonstatic_field(JavaThread, _satb_mark_queue, SATBMarkQueue)) \
- ALL_GCS_ONLY(nonstatic_field(JavaThread, _dirty_card_queue, DirtyCardQueue))
nonstatic_field(JavaThread, _pending_deoptimization, int)
nonstatic_field(JavaThread, _pending_failed_speculation, oop)
nonstatic_field(JavaThread, _pending_transfer_to_interpreter, bool)
nonstatic_field(JavaThread, _jvmci_counters, jlong*)
nonstatic_field(JavaThread, _reserved_stack_activation, address) \
@@ -513,12 +513,12 @@
declare_constant(Deoptimization::Reason_not_compiled_exception_handler)
declare_constant(Deoptimization::Reason_unresolved)
declare_constant(Deoptimization::Reason_jsr_mismatch)
declare_constant(Deoptimization::Reason_LIMIT)
\
- declare_constant_with_value("dirtyCardQueueBufferOffset", in_bytes(DirtyCardQueue::byte_offset_of_buf())) \
- declare_constant_with_value("dirtyCardQueueIndexOffset", in_bytes(DirtyCardQueue::byte_offset_of_index())) \
- ALL_GCS_ONLY(declare_constant_with_value("dirtyCardQueueBufferOffset", in_bytes(DirtyCardQueue::byte_offset_of_buf()))) \
- ALL_GCS_ONLY(declare_constant_with_value("dirtyCardQueueIndexOffset", in_bytes(DirtyCardQueue::byte_offset_of_index())))
declare_constant(FieldInfo::access_flags_offset)
declare_constant(FieldInfo::name_index_offset)
declare_constant(FieldInfo::signature_index_offset)
declare_constant(FieldInfo::initval_index_offset) \
@@ -571,13 +571,13 @@
declare_constant(ReceiverTypeData::nonprofiled_count_off_set)
declare_constant(ReceiverTypeData::receiver_type_row_cell_count)
declare_constant(ReceiverTypeData::receiver0_offset)
declare_constant(ReceiverTypeData::count0_offset)
\
- declare_constant_with_value("satbMarkQueueBufferOffset", in_bytes(SATBMarkQueue::byte_offset_of_buf())) \
- declare_constant_with_value("satbMarkQueueIndexOffset", in_bytes(SATBMarkQueue::byte_offset_of_index())) \
- declare_constant_with_value("satbMarkQueueActiveOffset", in_bytes(SATBMarkQueue::byte_offset_of_active())) \
- ALL_GCS_ONLY(declare_constant_with_value("satbMarkQueueBufferOffset", in_bytes(SATBMarkQueue::byte_offset_of_buf()))) \
- ALL_GCS_ONLY(declare_constant_with_value("satbMarkQueueIndexOffset", in_bytes(SATBMarkQueue::byte_offset_of_index()))) \
- ALL_GCS_ONLY(declare_constant_with_value("satbMarkQueueActiveOffset", in_bytes(SATBMarkQueue::byte_offset_of_active())))
declare_constant(vmIntrinsics::_invokeBasic)
declare_constant(vmIntrinsics::_linkToVirtual)
declare_constant(vmIntrinsics::_linkToStatic)
declare_constant(vmIntrinsics::_linkToSpecial) \
@@ -639,23 +639,23 @@
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)
- declare_function(JVMCIRuntime::write_barrier_pre)
- declare_function(JVMCIRuntime::write_barrier_post)
+ 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_G1(nonstatic_field, static_field)
+#define VM_STRUCTS_JVMCI_G1GC(nonstatic_field, static_field)
static_field(HeapRegion, LogOfHRGrainBytes, int)
-#define VM_INT_CONSTANTS_G1(declare_constant, declare_constant_with_value, declare_preprocessor_constant)
+#define VM_INT_CONSTANTS_JVMCI_G1GC(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
@@ -857,11 +857,11 @@ 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_G1(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
- VM_STRUCTS_JVMCI_G1GC(GENERATE_NONSTATIC_VM_STRUCT_ENTRY, GENERATE_STATIC_VM_STRUCT_ENTRY)
#endif
GENERATE_VM_STRUCT_LAST_ENTRY() };
@@ -909,11 +909,11 @@ 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_G1(GENERATE_VM_INT_CONSTANT_ENTRY,
- VM_INT_CONSTANTS_JVMCI_G1GC(GENERATE_VM_INT_CONSTANT_ENTRY, GENERATE_VM_INT_CONSTANT_WITH_VALUE_ENTRY, GENERATE_PREPROCESSOR_VM_INT_CONSTANT_ENTRY)
#endif
GENERATE_VM_INT_CONSTANT_LAST_ENTRY()