src/share/vm/memory/universe.hpp

rev 4773 : 8005849: JEP 167: Event-Based JVM Tracing
Reviewed-by: acorn, coleenp, sla
Contributed-by: Karen Kinnear <karen.kinnear@oracle.com>, Bengt Rutisson <bengt.rutisson@oracle.com>, Calvin Cheung <calvin.cheung@oracle.com>, Erik Gahlin <erik.gahlin@oracle.com>, Erik Helin <erik.helin@oracle.com>, Jesper Wilhelmsson <jesper.wilhelmsson@oracle.com>, Keith McGuigan <keith.mcguigan@oracle.com>, Mattias Tobiasson <mattias.tobiasson@oracle.com>, Markus Gronlund <markus.gronlund@oracle.com>, Mikael Auno <mikael.auno@oracle.com>, Nils Eliasson <nils.eliasson@oracle.com>, Nils Loodin <nils.loodin@oracle.com>, Rickard Backman <rickard.backman@oracle.com>, Staffan Larsen <staffan.larsen@oracle.com>, Stefan Karlsson <stefan.karlsson@oracle.com>, Yekaterina Kantserova <yekaterina.kantserova@oracle.com>

*** 251,273 ****
    static oop check_mirror(oop m) {
      assert(m != NULL, "mirror not initialized");
      return m;
    }
  
-   // Narrow Oop encoding mode:
-   // 0 - Use 32-bits oops without encoding when
-   //     NarrowOopHeapBaseMin + heap_size < 4Gb
-   // 1 - Use zero based compressed oops with encoding when
-   //     NarrowOopHeapBaseMin + heap_size < 32Gb
-   // 2 - Use compressed oops with heap base + encoding.
-   enum NARROW_OOP_MODE {
-     UnscaledNarrowOop  = 0,
-     ZeroBasedNarrowOop = 1,
-     HeapBasedNarrowOop = 2
-   };
-   static char*    preferred_heap_base(size_t heap_size, NARROW_OOP_MODE mode);
-   static char*    preferred_metaspace_base(size_t heap_size, NARROW_OOP_MODE mode);
    static void     set_narrow_oop_base(address base) {
      assert(UseCompressedOops, "no compressed oops?");
      _narrow_oop._base    = base;
    }
    static void     set_narrow_klass_base(address base) {
--- 251,260 ----
*** 378,387 ****
--- 365,389 ----
  
    // The particular choice of collected heap.
    static CollectedHeap* heap() { return _collectedHeap; }
  
    // For UseCompressedOops
+   // Narrow Oop encoding mode:
+   // 0 - Use 32-bits oops without encoding when
+   //     NarrowOopHeapBaseMin + heap_size < 4Gb
+   // 1 - Use zero based compressed oops with encoding when
+   //     NarrowOopHeapBaseMin + heap_size < 32Gb
+   // 2 - Use compressed oops with heap base + encoding.
+   enum NARROW_OOP_MODE {
+     UnscaledNarrowOop  = 0,
+     ZeroBasedNarrowOop = 1,
+     HeapBasedNarrowOop = 2
+   };
+   static NARROW_OOP_MODE narrow_oop_mode();
+   static const char* narrow_oop_mode_to_string(NARROW_OOP_MODE mode);
+   static char*    preferred_heap_base(size_t heap_size, NARROW_OOP_MODE mode);
+   static char*    preferred_metaspace_base(size_t heap_size, NARROW_OOP_MODE mode);
    static address  narrow_oop_base()                       { return  _narrow_oop._base; }
    static bool  is_narrow_oop_base(void* addr)             { return (narrow_oop_base() == (address)addr); }
    static int      narrow_oop_shift()                      { return  _narrow_oop._shift; }
    static bool     narrow_oop_use_implicit_null_checks()   { return  _narrow_oop._use_implicit_null_checks; }