diff src/share/vm/runtime/vmStructs.cpp @ 22236:179db500f6e5

Add Java code for reading the constant pool cache plus sun.reflect.ConstantPool substitutions.
author twisti
date Thu, 16 Jul 2015 07:47:07 -0700
parents be896a1983c0
children c28cb37b2e1d
line wrap: on
line diff
--- a/src/share/vm/runtime/vmStructs.cpp	Thu Jul 16 13:48:47 2015 +0200
+++ b/src/share/vm/runtime/vmStructs.cpp	Thu Jul 16 07:47:07 2015 -0700
@@ -1010,6 +1010,9 @@
   /*********************************/                                                                                                \
   /* JNIHandles and JNIHandleBlock */                                                                                                \
   /*********************************/                                                                                                \
+                                                                                                                                     \
+  nonstatic_field(Handle,                      _handle,                                       oop*)                                  \
+                                                                                                                                     \
      static_field(JNIHandles,                  _global_handles,                               JNIHandleBlock*)                       \
      static_field(JNIHandles,                  _weak_global_handles,                          JNIHandleBlock*)                       \
      static_field(JNIHandles,                  _deleted_handle,                               oop)                                   \
@@ -1742,6 +1745,8 @@
   /* JNIHandles and JNIHandleBlock */                                     \
   /*********************************/                                     \
                                                                           \
+  declare_toplevel_type(Handle)                                           \
+                                                                          \
   declare_toplevel_type(JNIHandles)                                       \
   declare_toplevel_type(JNIHandleBlock)                                   \
   declare_toplevel_type(jobject)                                          \
@@ -2538,9 +2543,22 @@
   declare_constant(ConstantPoolCacheEntry::is_final_shift)                \
   declare_constant(ConstantPoolCacheEntry::is_forced_virtual_shift)       \
   declare_constant(ConstantPoolCacheEntry::is_vfinal_shift)               \
+  declare_constant(ConstantPoolCacheEntry::has_appendix_shift)            \
+  declare_constant(ConstantPoolCacheEntry::has_method_type_shift)         \
   declare_constant(ConstantPoolCacheEntry::is_field_entry_shift)          \
   declare_constant(ConstantPoolCacheEntry::tos_state_shift)               \
                                                                           \
+  declare_constant(ConstantPoolCacheEntry::cp_index_bits)                 \
+  declare_constant(ConstantPoolCacheEntry::cp_index_mask)                 \
+  declare_constant(ConstantPoolCacheEntry::bytecode_1_shift)              \
+  declare_constant(ConstantPoolCacheEntry::bytecode_1_mask)               \
+  declare_constant(ConstantPoolCacheEntry::bytecode_2_shift)              \
+  declare_constant(ConstantPoolCacheEntry::bytecode_2_mask)               \
+                                                                          \
+  declare_constant(ConstantPoolCacheEntry::_indy_resolved_references_appendix_offset) \
+  declare_constant(ConstantPoolCacheEntry::_indy_resolved_references_method_type_offset) \
+  declare_constant(ConstantPoolCacheEntry::_indy_resolved_references_entries) \
+                                                                          \
   /***************************************/                               \
   /* java_lang_Thread::ThreadStatus enum */                               \
   /***************************************/                               \