comparison src/share/vm/memory/universe.hpp @ 12288:a7609ec351d6

Merge
author dcubed
date Fri, 20 Sep 2013 18:19:07 -0700
parents da051ce490eb
children 9d15b81d5d1b
comparison
equal deleted inserted replaced
12286:df03413ad1a9 12288:a7609ec351d6
177 static oop _vm_exception; 177 static oop _vm_exception;
178 178
179 // The particular choice of collected heap. 179 // The particular choice of collected heap.
180 static CollectedHeap* _collectedHeap; 180 static CollectedHeap* _collectedHeap;
181 181
182 static intptr_t _non_oop_bits;
183
182 // For UseCompressedOops. 184 // For UseCompressedOops.
183 static struct NarrowPtrStruct _narrow_oop; 185 static struct NarrowPtrStruct _narrow_oop;
184 // For UseCompressedKlassPointers. 186 // For UseCompressedClassPointers.
185 static struct NarrowPtrStruct _narrow_klass; 187 static struct NarrowPtrStruct _narrow_klass;
186 static address _narrow_ptrs_base; 188 static address _narrow_ptrs_base;
187 189
188 // array of dummy objects used with +FullGCAlot 190 // array of dummy objects used with +FullGCAlot
189 debug_only(static objArrayOop _fullgc_alot_dummy_array;) 191 debug_only(static objArrayOop _fullgc_alot_dummy_array;)
227 static void set_narrow_oop_base(address base) { 229 static void set_narrow_oop_base(address base) {
228 assert(UseCompressedOops, "no compressed oops?"); 230 assert(UseCompressedOops, "no compressed oops?");
229 _narrow_oop._base = base; 231 _narrow_oop._base = base;
230 } 232 }
231 static void set_narrow_klass_base(address base) { 233 static void set_narrow_klass_base(address base) {
232 assert(UseCompressedKlassPointers, "no compressed klass ptrs?"); 234 assert(UseCompressedClassPointers, "no compressed klass ptrs?");
233 _narrow_klass._base = base; 235 _narrow_klass._base = base;
234 } 236 }
235 static void set_narrow_oop_use_implicit_null_checks(bool use) { 237 static void set_narrow_oop_use_implicit_null_checks(bool use) {
236 assert(UseCompressedOops, "no compressed ptrs?"); 238 assert(UseCompressedOops, "no compressed ptrs?");
237 _narrow_oop._use_implicit_null_checks = use; 239 _narrow_oop._use_implicit_null_checks = use;
351 static address narrow_oop_base() { return _narrow_oop._base; } 353 static address narrow_oop_base() { return _narrow_oop._base; }
352 static bool is_narrow_oop_base(void* addr) { return (narrow_oop_base() == (address)addr); } 354 static bool is_narrow_oop_base(void* addr) { return (narrow_oop_base() == (address)addr); }
353 static int narrow_oop_shift() { return _narrow_oop._shift; } 355 static int narrow_oop_shift() { return _narrow_oop._shift; }
354 static bool narrow_oop_use_implicit_null_checks() { return _narrow_oop._use_implicit_null_checks; } 356 static bool narrow_oop_use_implicit_null_checks() { return _narrow_oop._use_implicit_null_checks; }
355 357
356 // For UseCompressedKlassPointers 358 // For UseCompressedClassPointers
357 static address narrow_klass_base() { return _narrow_klass._base; } 359 static address narrow_klass_base() { return _narrow_klass._base; }
358 static bool is_narrow_klass_base(void* addr) { return (narrow_klass_base() == (address)addr); } 360 static bool is_narrow_klass_base(void* addr) { return (narrow_klass_base() == (address)addr); }
359 static int narrow_klass_shift() { return _narrow_klass._shift; } 361 static int narrow_klass_shift() { return _narrow_klass._shift; }
360 static bool narrow_klass_use_implicit_null_checks() { return _narrow_klass._use_implicit_null_checks; } 362 static bool narrow_klass_use_implicit_null_checks() { return _narrow_klass._use_implicit_null_checks; }
361 363