jdk8-mips64-public/hotspot: comparison src/share/vm/runtime/vmStructs.cpp

-:8486f0c4b7c3
+:70aa912cebe5
 // NOTE that there are platform-specific additions to this table in
 // vmStructs_<os>_<cpu>.hpp.
 #define VM_STRUCTS(nonstatic_field, \
 static_field, \
+static_ptr_volatile_field, \
 unchecked_nonstatic_field, \
 volatile_nonstatic_field, \
 nonproduct_nonstatic_field, \
 c1_nonstatic_field, \
 c2_nonstatic_field, \
 volatile_nonstatic_field(ObjectMonitor,      _recursions,                                   intptr_t)                              \
 nonstatic_field(ObjectMonitor,               FreeNext,                                      ObjectMonitor*)                        \
 volatile_nonstatic_field(BasicLock,          _displaced_header,                             markOop)                               \
 nonstatic_field(BasicObjectLock,             _lock,                                         BasicLock)                             \
 nonstatic_field(BasicObjectLock,             _obj,                                          oop)                                   \
-static_field(ObjectSynchronizer,             gBlockList,                                    ObjectMonitor*)                        \
+static_ptr_volatile_field(ObjectSynchronizer,gBlockList,                                    ObjectMonitor*)                        \
 \
 /*********************/                                                                                                            \
 /* Matcher (C2 only) */                                                                                                            \
 /*********************/                                                                                                            \
 \
 // This macro generates a VMStructEntry line for a static field
 #define GENERATE_STATIC_VM_STRUCT_ENTRY(typeName, fieldName, type)                 \
 { QUOTE(typeName), QUOTE(fieldName), QUOTE(type), 1, 0, &typeName::fieldName },
+// This macro generates a VMStructEntry line for a static pointer volatile field,
+// e.g.: "static ObjectMonitor * volatile gBlockList;"
+#define GENERATE_STATIC_PTR_VOLATILE_VM_STRUCT_ENTRY(typeName, fieldName, type)    \
+{ QUOTE(typeName), QUOTE(fieldName), QUOTE(type), 1, 0, (void*)&typeName::fieldName },
 // This macro generates a VMStructEntry line for an unchecked
 // nonstatic field, in which the size of the type is also specified.
 // The type string is given as NULL, indicating an "opaque" type.
 #define GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY(typeName, fieldName, size)    \
 { QUOTE(typeName), QUOTE(fieldName), NULL, 0, cast_uint64_t(offset_of(typeName, fieldName)), NULL },
 // This macro checks the type of a volatile VMStructEntry by comparing pointer types
 #define CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY(typeName, fieldName, type)        \
 {typedef type dummyvtype; typeName *dummyObj = NULL; volatile dummyvtype* dummy = &dummyObj->fieldName; }
-// This macro checks the type of a VMStructEntry by comparing pointer types
+// This macro checks the type of a static VMStructEntry by comparing pointer types
 #define CHECK_STATIC_VM_STRUCT_ENTRY(typeName, fieldName, type)                    \
 {type* dummy = &typeName::fieldName; }
+// This macro checks the type of a static pointer volatile VMStructEntry by comparing pointer types,
+// e.g.: "static ObjectMonitor * volatile gBlockList;"
+#define CHECK_STATIC_PTR_VOLATILE_VM_STRUCT_ENTRY(typeName, fieldName, type)       \
+{type volatile * dummy = &typeName::fieldName; }
 // This macro ensures the type of a field and its containing type are
 // present in the type table. The assertion string is shorter than
 // preferable because (incredibly) of a bug in Solstice NFS client
 // which seems to prevent very long lines from compiling. This assertion
 // as long as class VMStructs is a friend
 VMStructEntry VMStructs::localHotSpotVMStructs[] = {
 VM_STRUCTS(GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
 GENERATE_STATIC_VM_STRUCT_ENTRY,
+GENERATE_STATIC_PTR_VOLATILE_VM_STRUCT_ENTRY,
 GENERATE_UNCHECKED_NONSTATIC_VM_STRUCT_ENTRY,
 GENERATE_NONSTATIC_VM_STRUCT_ENTRY,
 GENERATE_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
 GENERATE_C1_NONSTATIC_VM_STRUCT_ENTRY,
 GENERATE_C2_NONSTATIC_VM_STRUCT_ENTRY,
 // debug builds, to ensure that all of the field types are present.
 void
 VMStructs::init() {
 VM_STRUCTS(CHECK_NONSTATIC_VM_STRUCT_ENTRY,
 CHECK_STATIC_VM_STRUCT_ENTRY,
+CHECK_STATIC_PTR_VOLATILE_VM_STRUCT_ENTRY,
 CHECK_NO_OP,
 CHECK_VOLATILE_NONSTATIC_VM_STRUCT_ENTRY,
 CHECK_NONPRODUCT_NONSTATIC_VM_STRUCT_ENTRY,
 CHECK_C1_NONSTATIC_VM_STRUCT_ENTRY,
 CHECK_C2_NONSTATIC_VM_STRUCT_ENTRY,
 CHECK_NO_OP,
 CHECK_NO_OP,
 CHECK_NO_OP,
 CHECK_NO_OP,
 CHECK_NO_OP,
+CHECK_NO_OP,
 CHECK_NO_OP));
 debug_only(VM_STRUCTS(CHECK_NO_OP,
+ENSURE_FIELD_TYPE_PRESENT,
 ENSURE_FIELD_TYPE_PRESENT,
 CHECK_NO_OP,
 ENSURE_FIELD_TYPE_PRESENT,
 ENSURE_NONPRODUCT_FIELD_TYPE_PRESENT,
 ENSURE_C1_FIELD_TYPE_PRESENT,

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/runtime/vmStructs.cpp

src/share/vm/runtime/vmStructs.cpp