comparison src/share/vm/code/nmethod.cpp @ 6806:f2e12eb74117 hs25-b03

Merge
author kvn
date Fri, 28 Sep 2012 10:16:29 -0700
parents 8966c2d65d96 b31471cdc53e
children 18fb7da42534
comparison
equal deleted inserted replaced
6789:15fba4382765 6806:f2e12eb74117
461 _has_flushed_dependencies = 0; 461 _has_flushed_dependencies = 0;
462 _speculatively_disconnected = 0; 462 _speculatively_disconnected = 0;
463 _has_unsafe_access = 0; 463 _has_unsafe_access = 0;
464 _has_method_handle_invokes = 0; 464 _has_method_handle_invokes = 0;
465 _lazy_critical_native = 0; 465 _lazy_critical_native = 0;
466 _has_wide_vectors = 0;
466 _marked_for_deoptimization = 0; 467 _marked_for_deoptimization = 0;
467 _lock_count = 0; 468 _lock_count = 0;
468 _stack_traversal_mark = 0; 469 _stack_traversal_mark = 0;
469 _unload_reported = false; // jvmti state 470 _unload_reported = false; // jvmti state
470 471
698 // print the header part first 699 // print the header part first
699 print(); 700 print();
700 // then print the requested information 701 // then print the requested information
701 if (PrintNativeNMethods) { 702 if (PrintNativeNMethods) {
702 print_code(); 703 print_code();
703 oop_maps->print(); 704 if (oop_maps != NULL) {
705 oop_maps->print();
706 }
704 } 707 }
705 if (PrintRelocations) { 708 if (PrintRelocations) {
706 print_relocations(); 709 print_relocations();
707 } 710 }
708 if (xtty != NULL) { 711 if (xtty != NULL) {
2664 p->return_oop()); 2667 p->return_oop());
2665 } 2668 }
2666 return NULL; 2669 return NULL;
2667 } 2670 }
2668 2671
2669 void nmethod::print_nmethod_labels(outputStream* stream, address block_begin) { 2672 void nmethod::print_nmethod_labels(outputStream* stream, address block_begin) const {
2670 if (block_begin == entry_point()) stream->print_cr("[Entry Point]"); 2673 if (block_begin == entry_point()) stream->print_cr("[Entry Point]");
2671 if (block_begin == verified_entry_point()) stream->print_cr("[Verified Entry Point]"); 2674 if (block_begin == verified_entry_point()) stream->print_cr("[Verified Entry Point]");
2672 if (block_begin == exception_begin()) stream->print_cr("[Exception Handler]"); 2675 if (block_begin == exception_begin()) stream->print_cr("[Exception Handler]");
2673 if (block_begin == stub_begin()) stream->print_cr("[Stub Code]"); 2676 if (block_begin == stub_begin()) stream->print_cr("[Stub Code]");
2674 if (block_begin == deopt_handler_begin()) stream->print_cr("[Deopt Handler Code]"); 2677 if (block_begin == deopt_handler_begin()) stream->print_cr("[Deopt Handler Code]");