< prev index next >

src/share/vm/memory/universe.hpp

Print this page
rev 12854 : [mq]: gcinterface.patch

*** 23,32 **** --- 23,33 ---- */ #ifndef SHARE_VM_MEMORY_UNIVERSE_HPP #define SHARE_VM_MEMORY_UNIVERSE_HPP + #include "gc/shared/gc.hpp" #include "runtime/handles.hpp" #include "utilities/array.hpp" #include "utilities/growableArray.hpp" // Universe is a name space holding known system classes and objects in the VM.
*** 181,193 **** static oop _allocation_context_notification_obj; // References waiting to be transferred to the ReferenceHandler static oop _reference_pending_list; - // The particular choice of collected heap. - static CollectedHeap* _collectedHeap; - static intptr_t _non_oop_bits; // For UseCompressedOops. static struct NarrowPtrStruct _narrow_oop; // For UseCompressedClassPointers. --- 182,191 ----
*** 216,228 **** // Historic gc information static size_t _heap_capacity_at_last_gc; static size_t _heap_used_at_last_gc; - template <class Heap, class Policy> static CollectedHeap* create_heap_with_policy(); - static CollectedHeap* create_heap(); - static CollectedHeap* create_heap_ext(); static jint initialize_heap(); static void initialize_basic_type_mirrors(TRAPS); static void fixup_mirrors(TRAPS); static void reinitialize_vtable_of(Klass* k, TRAPS); --- 214,223 ----
*** 369,379 **** static Klass** singleArrayKlassObj_addr() { return &_singleArrayKlassObj; } static Klass** doubleArrayKlassObj_addr() { return &_doubleArrayKlassObj; } static Klass** objectArrayKlassObj_addr() { return &_objectArrayKlassObj; } // 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 --- 364,380 ---- static Klass** singleArrayKlassObj_addr() { return &_singleArrayKlassObj; } static Klass** doubleArrayKlassObj_addr() { return &_doubleArrayKlassObj; } static Klass** objectArrayKlassObj_addr() { return &_objectArrayKlassObj; } // The particular choice of collected heap. ! /* ! static CollectedHeap* heap() { ! GC* gc = GC::gc(); ! if (gc != NULL) return gc->heap(); ! else return NULL; ! } ! */ // For UseCompressedOops // Narrow Oop encoding mode: // 0 - Use 32-bits oops without encoding when // NarrowOopHeapBaseMin + heap_size < 4Gb
< prev index next >