graal-jvmci-8: src/share/vm/memory/universe.cpp comparison

comparison src/share/vm/memory/universe.cpp @ 23660:b5f3a471e646

Merge.

author	Doug Simon <doug.simon@oracle.com>
date	Wed, 01 Jun 2016 00:11:44 +0200
parents	7848fc12602b 88ae10297731
children	f13e777eb255

comparison

equal deleted inserted replaced

-:d7cf78885a3a
+:b5f3a471e646
 oop Universe::_the_null_string                        = NULL;
 oop Universe::_the_min_jint_string                   = NULL;
 LatestMethodCache* Universe::_finalizer_register_cache = NULL;
 LatestMethodCache* Universe::_loader_addClass_cache    = NULL;
 LatestMethodCache* Universe::_pd_implies_cache         = NULL;
+LatestMethodCache* Universe::_throw_illegal_access_error_cache = NULL;
 oop Universe::_out_of_memory_error_java_heap          = NULL;
 oop Universe::_out_of_memory_error_metaspace          = NULL;
 oop Universe::_out_of_memory_error_class_metaspace    = NULL;
 oop Universe::_out_of_memory_error_array_size         = NULL;
 oop Universe::_out_of_memory_error_gc_overhead_limit  = NULL;
 oop Universe::_arithmetic_exception_instance          = NULL;
 oop Universe::_virtual_machine_error_instance         = NULL;
 oop Universe::_vm_exception                           = NULL;
 oop Universe::_allocation_context_notification_obj    = NULL;
-Method* Universe::_throw_illegal_access_error         = NULL;
 Array<int>* Universe::_the_empty_int_array            = NULL;
 Array<u2>* Universe::_the_empty_short_array           = NULL;
 Array<Klass*>* Universe::_the_empty_klass_array     = NULL;
 Array<Method*>* Universe::_the_empty_method_array   = NULL;
 f->do_ptr((void**)&_the_empty_method_array);
 f->do_ptr((void**)&_the_empty_klass_array);
 _finalizer_register_cache->serialize(f);
 _loader_addClass_cache->serialize(f);
 _pd_implies_cache->serialize(f);
+_throw_illegal_access_error_cache->serialize(f);
 }
 void Universe::check_alignment(uintx size, uintx alignment, const char* name) {
 if (size < alignment || size % alignment != 0) {
 vm_exit_during_initialization(
 // We have a heap so create the Method* caches before
 // Metaspace::initialize_shared_spaces() tries to populate them.
 Universe::_finalizer_register_cache = new LatestMethodCache();
 Universe::_loader_addClass_cache    = new LatestMethodCache();
 Universe::_pd_implies_cache         = new LatestMethodCache();
+Universe::_throw_illegal_access_error_cache = new LatestMethodCache();
 if (UseSharedSpaces) {
 // Read the data structures supporting the shared spaces (shared
 // system dictionary, symbol table, etc.).  After that, access to
 // the file (other than the mapped regions) is no longer needed, and
 // This also makes implicit null checking work, because the
 // memory+1 page below heap_base needs to cause a signal.
 // See needs_explicit_null_check.
 // Only set the heap base for compressed oops because it indicates
 // compressed oops for pstack code.
-bool verbose = PrintCompressedOopsMode || (PrintMiscellaneous && Verbose);
-if (verbose) {
-tty->cr();
-tty->print("heap address: " PTR_FORMAT ", size: " SIZE_FORMAT " MB",
-Universe::heap()->base(), Universe::heap()->reserved_region().byte_size()/M);
-}
 if (((uint64_t)Universe::heap()->reserved_region().end() > OopEncodingHeapMax)) {
 // Can't reserve heap below 32Gb.
 // keep the Universe::narrow_oop_base() set in Universe::reserve_heap()
 Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);
 #ifdef AIX
 // There is no protected page before the heap. This assures all oops
 // are decoded so that NULL is preserved, so this page will not be accessed.
 Universe::set_narrow_oop_use_implicit_null_checks(false);
 #endif
-if (verbose) {
-tty->print(", %s: "PTR_FORMAT,
-narrow_oop_mode_to_string(HeapBasedNarrowOop),
-Universe::narrow_oop_base());
-}
 } else {
 Universe::set_narrow_oop_base(0);
-if (verbose) {
-tty->print(", %s", narrow_oop_mode_to_string(ZeroBasedNarrowOop));
-}
 #ifdef _WIN64
 if (!Universe::narrow_oop_use_implicit_null_checks()) {
 // Don't need guard page for implicit checks in indexed addressing
 // mode with zero based Compressed Oops.
 Universe::set_narrow_oop_use_implicit_null_checks(true);
 if((uint64_t)Universe::heap()->reserved_region().end() > UnscaledOopHeapMax) {
 // Can't reserve heap below 4Gb.
 Universe::set_narrow_oop_shift(LogMinObjAlignmentInBytes);
 } else {
 Universe::set_narrow_oop_shift(0);
-if (verbose) {
-tty->print(", %s", narrow_oop_mode_to_string(UnscaledNarrowOop));
-}
 }
 }
-if (verbose) {
-tty->cr();
-tty->cr();
-}
 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()) ||
 Universe::narrow_oop_base() == NULL, "invalid value");
 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(),
 err_msg("actual alignment "SIZE_FORMAT" must be within maximum heap alignment "SIZE_FORMAT,
 const char* Universe::narrow_oop_mode_to_string(Universe::NARROW_OOP_MODE mode) {
 switch (mode) {
 case UnscaledNarrowOop:
-return "32-bits Oops";
+return "32-bit";
 case ZeroBasedNarrowOop:
-return "zero based Compressed Oops";
+return "Zero based";
 case HeapBasedNarrowOop:
-return "Compressed Oops with base";
+return "Non-zero based";
 }
 ShouldNotReachHere();
 return "";
 }
 // Note null is okay; this method is used in itables, and if it is null,
 // then AbstractMethodError is thrown instead.
 tty->print_cr("Unable to link/verify Unsafe.throwIllegalAccessError method");
 return false; // initialization failed (cannot throw exception yet)
 }
-Universe::_throw_illegal_access_error = m;
+Universe::_throw_illegal_access_error_cache->init(
+SystemDictionary::misc_Unsafe_klass(), m);
 // Setup method for registering loaded classes in class loader vector
 InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->link_class(CHECK_false);
 m = InstanceKlass::cast(SystemDictionary::ClassLoader_klass())->find_method(vmSymbols::addClass_name(), vmSymbols::class_void_signature());
 if (m == NULL || m->is_static()) {
 // <init> function before java_lang_Class is linked. Print error and exit.
 tty->print_cr("ProtectionDomain.impliesCreateAccessControlContext() has the wrong linkage");
 return false; // initialization failed
 }
 Universe::_pd_implies_cache->init(
-SystemDictionary::ProtectionDomain_klass(), m);;
+SystemDictionary::ProtectionDomain_klass(), m);
 }
 // The folowing is initializing converter functions for serialization in
 // JVM.cpp. If we clean up the StrictMath code above we may want to find
 // a better solution for this as well.

Mercurial > hg > graal-jvmci-8

comparison src/share/vm/memory/universe.cpp @ 23660:b5f3a471e646