comparison src/share/vm/code/nmethod.cpp @ 6275:957c266d8bc5

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Tue, 21 Aug 2012 10:39:19 +0200
parents 2585af1e26ac 1d7922586cf6
children e522a00b91aa 8c5333c80cfd
comparison
equal deleted inserted replaced
5891:fd8832ae511d 6275:957c266d8bc5
966 966
967 // Print out more verbose output usually for a newly created nmethod. 967 // Print out more verbose output usually for a newly created nmethod.
968 void nmethod::print_on(outputStream* st, const char* msg) const { 968 void nmethod::print_on(outputStream* st, const char* msg) const {
969 if (st != NULL) { 969 if (st != NULL) {
970 ttyLocker ttyl; 970 ttyLocker ttyl;
971 CompileTask::print_compilation(st, this, msg); 971 if (WizardMode) {
972 if (WizardMode) st->print(" (" INTPTR_FORMAT ")", this); 972 CompileTask::print_compilation(st, this, msg, /*short_form:*/ true);
973 st->print_cr(" (" INTPTR_FORMAT ")", this);
974 } else {
975 CompileTask::print_compilation(st, this, msg, /*short_form:*/ false);
976 }
973 } 977 }
974 } 978 }
975 979
976 980
977 void nmethod::print_nmethod(bool printmethod) { 981 void nmethod::print_nmethod(bool printmethod) {
985 print(); 989 print();
986 // then print the requested information 990 // then print the requested information
987 if (printmethod) { 991 if (printmethod) {
988 print_code(); 992 print_code();
989 print_pcs(); 993 print_pcs();
990 oop_maps()->print(); 994 if (oop_maps()) {
995 oop_maps()->print();
996 }
991 } 997 }
992 if (PrintDebugInfo) { 998 if (PrintDebugInfo) {
993 print_scopes(); 999 print_scopes();
994 } 1000 }
995 if (PrintRelocations) { 1001 if (PrintRelocations) {