diff -r d55c96b36b5f -r 60081f497e75 hotspot/src/share/vm/memory/universe.cpp --- a/hotspot/src/share/vm/memory/universe.cpp Mon Jun 08 15:40:28 2015 +0200 +++ b/hotspot/src/share/vm/memory/universe.cpp Tue Jun 09 10:26:25 2015 -0400 @@ -754,7 +754,7 @@ Universe::set_narrow_ptrs_base(Universe::narrow_oop_base()); if (PrintCompressedOopsMode || (PrintMiscellaneous && Verbose)) { - Universe::print_compressed_oops_mode(); + Universe::print_compressed_oops_mode(tty); } // Tell tests in which mode we run. @@ -781,27 +781,24 @@ return JNI_OK; } -void Universe::print_compressed_oops_mode() { - tty->cr(); - tty->print("heap address: " PTR_FORMAT ", size: " SIZE_FORMAT " MB", +void Universe::print_compressed_oops_mode(outputStream* st) { + st->print("heap address: " PTR_FORMAT ", size: " SIZE_FORMAT " MB", p2i(Universe::heap()->base()), Universe::heap()->reserved_region().byte_size()/M); - tty->print(", Compressed Oops mode: %s", narrow_oop_mode_to_string(narrow_oop_mode())); + st->print(", Compressed Oops mode: %s", narrow_oop_mode_to_string(narrow_oop_mode())); if (Universe::narrow_oop_base() != 0) { - tty->print(": " PTR_FORMAT, p2i(Universe::narrow_oop_base())); + st->print(": " PTR_FORMAT, p2i(Universe::narrow_oop_base())); } if (Universe::narrow_oop_shift() != 0) { - tty->print(", Oop shift amount: %d", Universe::narrow_oop_shift()); + st->print(", Oop shift amount: %d", Universe::narrow_oop_shift()); } if (!Universe::narrow_oop_use_implicit_null_checks()) { - tty->print(", no protected page in front of the heap"); + st->print(", no protected page in front of the heap"); } - - tty->cr(); - tty->cr(); + st->cr(); } ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {