Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
static_field(VM_Version, _rop_protection, bool) \
static_field(VM_Version, _pac_mask, uintptr_t)

#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type) \
declare_toplevel_type(VM_Version)
#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type)

#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)

Expand Down
15 changes: 10 additions & 5 deletions src/hotspot/cpu/x86/vmStructs_x86.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,20 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.

#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field) \
volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*)
#define VM_STRUCTS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field) \
volatile_nonstatic_field(JavaFrameAnchor, _last_Java_fp, intptr_t*) \
static_field(VM_Version, _features, VM_Version::VM_Features) \
nonstatic_field(VM_Version::VM_Features, _features_bitmap[0], uint64_t) \
static_field(VM_Version::VM_Features, _features_bitmap_size_in_bytes, int)

#define VM_TYPES_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type) \
declare_toplevel_type(VM_Version::VM_Features)

#define VM_INT_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant) \
LP64_ONLY(declare_constant(frame::arg_reg_save_area_bytes)) \
declare_constant(frame::interpreter_frame_sender_sp_offset) \
declare_constant(frame::interpreter_frame_last_sp_offset)
declare_constant(frame::arg_reg_save_area_bytes) \
declare_constant(frame::interpreter_frame_sender_sp_offset) \
declare_constant(frame::interpreter_frame_last_sp_offset) \
declare_constant(frame::entry_frame_call_wrapper_offset)

#define VM_LONG_CONSTANTS_CPU(declare_constant, declare_preprocessor_constant)

Expand Down
10 changes: 3 additions & 7 deletions src/hotspot/share/runtime/vmStructs.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

/*
* Copyright (c) 2000, 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
Expand Down Expand Up @@ -708,10 +709,6 @@
static_field(Abstract_VM_Version, _vm_security_version, int) \
static_field(Abstract_VM_Version, _vm_build_number, int) \
\
NOT_ZERO(X86_ONLY( static_field(VM_Version, _features, VM_Version::VM_Features))) \
NOT_ZERO(X86_ONLY(nonstatic_field(VM_Version::VM_Features, _features_bitmap[0], uint64_t))) \
NOT_ZERO(X86_ONLY( static_field(VM_Version::VM_Features, _features_bitmap_size_in_bytes, int))) \
\
/*************************/ \
/* JVMTI */ \
/*************************/ \
Expand Down Expand Up @@ -1168,8 +1165,7 @@
/********************/ \
\
declare_toplevel_type(Abstract_VM_Version) \
NOT_ZERO(declare_toplevel_type(VM_Version)) \
NOT_ZERO(X86_ONLY(declare_toplevel_type(VM_Version::VM_Features))) \
declare_toplevel_type(VM_Version) \
\
/*************/ \
/* Arguments */ \
Expand Down Expand Up @@ -1722,7 +1718,6 @@
/**********************/ \
NOT_ZERO(PPC64_ONLY(declare_constant(frame::entry_frame_locals_size))) \
\
NOT_ZERO(X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset))) \
declare_constant(frame::pc_return_offset) \
\
/*************/ \
Expand Down Expand Up @@ -2152,3 +2147,4 @@ void vmStructs_init() {
VMStructs::init();
}
#endif // ASSERT