src/share/vm/memory/universe.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 880,890 ****
      }
  
      Universe::set_narrow_ptrs_base(Universe::narrow_oop_base());
  
      if (PrintCompressedOopsMode || (PrintMiscellaneous && Verbose)) {
!       Universe::print_compressed_oops_mode();
      }
    }
    // Universe::narrow_oop_base() is one page below the heap.
    assert((intptr_t)Universe::narrow_oop_base() <= (intptr_t)(Universe::heap()->base() -
           os::vm_page_size()) ||
--- 880,890 ----
      }
  
      Universe::set_narrow_ptrs_base(Universe::narrow_oop_base());
  
      if (PrintCompressedOopsMode || (PrintMiscellaneous && Verbose)) {
!       Universe::print_compressed_oops_mode(tty);
      }
    }
    // Universe::narrow_oop_base() is one page below the heap.
    assert((intptr_t)Universe::narrow_oop_base() <= (intptr_t)(Universe::heap()->base() -
           os::vm_page_size()) ||
*** 902,928 ****
      ThreadLocalAllocBuffer::startup_initialization();
    }
    return JNI_OK;
  }
  
! void Universe::print_compressed_oops_mode() {
!   tty->cr();
!   tty->print("heap address: " PTR_FORMAT ", size: " SIZE_FORMAT " MB",
                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, Universe::narrow_oop_base());
    }
  
    if (Universe::narrow_oop_shift() != 0) {
!     tty->print(", Oop shift amount: %d", Universe::narrow_oop_shift());
    }
  
!   tty->cr();
!   tty->cr();
  }
  
  // Reserve the Java heap, which is now the same for all GCs.
  ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
    assert(alignment <= Arguments::conservative_max_heap_alignment(),
--- 902,926 ----
      ThreadLocalAllocBuffer::startup_initialization();
    }
    return JNI_OK;
  }
  
! void Universe::print_compressed_oops_mode(outputStream* st) {
!   st->print("heap address: " PTR_FORMAT ", size: " SIZE_FORMAT " MB",
                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, Universe::narrow_oop_base());
    }
  
    if (Universe::narrow_oop_shift() != 0) {
!     st->print(", Oop shift amount: %d", Universe::narrow_oop_shift());
    }
  
!   st->cr();
  }
  
  // Reserve the Java heap, which is now the same for all GCs.
  ReservedSpace Universe::reserve_heap(size_t heap_size, size_t alignment) {
    assert(alignment <= Arguments::conservative_max_heap_alignment(),