src/hotspot/share/runtime/vmStructs.cpp

rev 47404 : [mq]: load_ptr_acquire

*** 59,68 ****
--- 59,69 ----
  #include "interpreter/interpreter.hpp"
  #include "memory/allocation.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/heap.hpp"
  #include "memory/metachunk.hpp"
+ #include "memory/padded.hpp"
  #include "memory/referenceType.hpp"
  #include "memory/universe.hpp"
  #include "memory/virtualspace.hpp"
  #include "oops/array.hpp"
  #include "oops/arrayKlass.hpp"
*** 196,205 ****
--- 197,208 ----
  typedef Hashtable<InstanceKlass*, mtClass>       KlassHashtable;
  typedef HashtableEntry<InstanceKlass*, mtClass>  KlassHashtableEntry;
  typedef CompactHashtable<Symbol*, char>       SymbolCompactHashTable;
  typedef RehashableHashtable<Symbol*, mtSymbol>   RehashableSymbolHashtable;
  
+ typedef PaddedEnd<ObjectMonitor>              PaddedObjectMonitor;
+ 
  //--------------------------------------------------------------------------------
  // VM_STRUCTS
  //
  // This list enumerates all of the fields the serviceability agent
  // needs to know about. Be sure to see also the type table below this one.
*** 1050,1060 ****
    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_ptr_volatile_field(ObjectSynchronizer, gBlockList,                                   ObjectMonitor*)                        \
                                                                                                                                       \
    /*********************/                                                                                                            \
    /* Matcher (C2 only) */                                                                                                            \
    /*********************/                                                                                                            \
                                                                                                                                       \
--- 1053,1063 ----
    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_ptr_volatile_field(ObjectSynchronizer, gBlockList,                                   PaddedObjectMonitor*)                  \
                                                                                                                                       \
    /*********************/                                                                                                            \
    /* Matcher (C2 only) */                                                                                                            \
    /*********************/                                                                                                            \
                                                                                                                                       \
*** 1678,1687 ****
--- 1681,1691 ----
    /************/                                                          \
    /* Monitors */                                                          \
    /************/                                                          \
                                                                            \
    declare_toplevel_type(ObjectMonitor)                                    \
+   declare_toplevel_type(PaddedObjectMonitor)                              \
    declare_toplevel_type(ObjectSynchronizer)                               \
    declare_toplevel_type(BasicLock)                                        \
    declare_toplevel_type(BasicObjectLock)                                  \
                                                                            \
    /*********************/                                                 \
*** 2152,2161 ****
--- 2156,2166 ----
    declare_toplevel_type(jmethodID*)                                       \
    declare_toplevel_type(Mutex*)                                           \
    declare_toplevel_type(nmethod*)                                         \
    COMPILER2_PRESENT(declare_unsigned_integer_type(node_idx_t))            \
    declare_toplevel_type(ObjectMonitor*)                                   \
+   declare_toplevel_type(PaddedObjectMonitor*)                             \
    declare_toplevel_type(oop*)                                             \
    declare_toplevel_type(OopMap**)                                         \
    declare_toplevel_type(OopMapCache*)                                     \
    declare_toplevel_type(OopMapSet*)                                       \
    declare_toplevel_type(VMReg)                                            \