comparison src/share/vm/memory/universe.cpp @ 1966:4110c3e0c50d

Merge
author iveresov
date Fri, 19 Nov 2010 17:01:34 -0800
parents 9eecf81a02fb 0ac62b4d6507
children f95d63e2154a
comparison
equal deleted inserted replaced
1962:0be53e62c06c 1966:4110c3e0c50d
862 // See needs_explicit_null_check. 862 // See needs_explicit_null_check.
863 // Only set the heap base for compressed oops because it indicates 863 // Only set the heap base for compressed oops because it indicates
864 // compressed oops for pstack code. 864 // compressed oops for pstack code.
865 if (PrintCompressedOopsMode) { 865 if (PrintCompressedOopsMode) {
866 tty->cr(); 866 tty->cr();
867 tty->print("heap address: "PTR_FORMAT, Universe::heap()->base()); 867 tty->print("heap address: " PTR_FORMAT ", size: " SIZE_FORMAT " MB",
868 Universe::heap()->base(), Universe::heap()->reserved_region().byte_size()/M);
868 } 869 }
869 if ((uint64_t)Universe::heap()->reserved_region().end() > OopEncodingHeapMax) { 870 if ((uint64_t)Universe::heap()->reserved_region().end() > OopEncodingHeapMax) {
870 // Can't reserve heap below 32Gb. 871 // Can't reserve heap below 32Gb.
871 Universe::set_narrow_oop_base(Universe::heap()->base() - os::vm_page_size()); 872 Universe::set_narrow_oop_base(Universe::heap()->base() - os::vm_page_size());
872 Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes); 873 Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);