src/share/vm/memory/universe.cpp

*** 752,762 ****
      }
  
      Universe::set_narrow_ptrs_base(Universe::narrow_oop_base());
  
      if (PrintCompressedOopsMode || (PrintMiscellaneous && Verbose)) {
!       Universe::print_compressed_oops_mode();
      }
  
      // Tell tests in which mode we run.
      Arguments::PropertyList_add(new SystemProperty("java.vm.compressedOopsMode",
                                                     narrow_oop_mode_to_string(narrow_oop_mode()),
--- 752,762 ----
      }
  
      Universe::set_narrow_ptrs_base(Universe::narrow_oop_base());
  
      if (PrintCompressedOopsMode || (PrintMiscellaneous && Verbose)) {
!       Universe::print_compressed_oops_mode(tty);
      }
  
      // Tell tests in which mode we run.
      Arguments::PropertyList_add(new SystemProperty("java.vm.compressedOopsMode",
                                                     narrow_oop_mode_to_string(narrow_oop_mode()),
*** 779,809 ****
      ThreadLocalAllocBuffer::startup_initialization();
    }
    return JNI_OK;
  }
  
! void Universe::print_compressed_oops_mode() {
!   tty->cr();
!   tty->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()));
  
    if (Universe::narrow_oop_base() != 0) {
!     tty->print(": " PTR_FORMAT, p2i(Universe::narrow_oop_base()));
    }
  
    if (Universe::narrow_oop_shift() != 0) {
!     tty->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");
    }
! 
!   tty->cr();
!   tty->cr();
  }
  
  ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
  
    assert(alignment <= Arguments::conservative_max_heap_alignment(),
--- 779,806 ----
      ThreadLocalAllocBuffer::startup_initialization();
    }
    return JNI_OK;
  }
  
! 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);
  
!   st->print(", Compressed Oops mode: %s", narrow_oop_mode_to_string(narrow_oop_mode()));
  
    if (Universe::narrow_oop_base() != 0) {
!     st->print(": " PTR_FORMAT, p2i(Universe::narrow_oop_base()));
    }
  
    if (Universe::narrow_oop_shift() != 0) {
!     st->print(", Oop shift amount: %d", Universe::narrow_oop_shift());
    }
  
    if (!Universe::narrow_oop_use_implicit_null_checks()) {
!     st->print(", no protected page in front of the heap");
    }
!   st->cr();
  }
  
  ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
  
    assert(alignment <= Arguments::conservative_max_heap_alignment(),