jdk-sandbox: comparison hotspot/src/share/vm/code/nmethod.cpp

equal deleted inserted replaced

-:e13ccc474a28
+:df859fcca515
 assert(compiler->is_c2() ||
 _method->is_static() == (entry_point() == _verified_entry_point),
 " entry points must be same for static methods and vice versa");
 }
-bool printnmethods = PrintNMethods || CompilerOracle::has_option_string(_method, "PrintNMethods");
+bool printnmethods = PrintNMethods
+|| CompilerOracle::should_print(_method)
+|| CompilerOracle::has_option_string(_method, "PrintNMethods");
 if (printnmethods || PrintDebugInfo || PrintRelocations || PrintDependencies || PrintExceptionHandlers) {
 print_nmethod(printnmethods);
 }
 // Note: Do not verify in here as the CodeCache_lock is
 }
 }
 }
-#ifndef PRODUCT
 void nmethod::print_nmethod(bool printmethod) {
 ttyLocker ttyl;  // keep the following output all in one block
 if (xtty != NULL) {
 xtty->begin_head("print_nmethod");
 xtty->stamp();
 }
 if (xtty != NULL) {
 xtty->tail("print_nmethod");
 }
 }
-#endif
 void nmethod::set_version(int v) {
 flags.version = v;
 }
 }
 }
 }
 }
+#endif // PRODUCT
 // Printing operations
 void nmethod::print() const {
 ResourceMark rm;
 oops_begin(),
 oops_end(),
 oops_size());
 }
+void nmethod::print_code() {
+HandleMark hm;
+ResourceMark m;
+Disassembler::decode(this);
+}
+#ifndef PRODUCT
 void nmethod::print_scopes() {
 // Find the first pc desc for all scopes in the code and print it.
 ResourceMark rm;
 for (PcDesc* p = scopes_pcs_begin(); p < scopes_pcs_end(); p++) {
 tty->print_cr("   [nmethod<=klass]%s", k->external_name());
 }
 }
 deps.log_dependency();  // put it into the xml log also
 }
-}
-void nmethod::print_code() {
-HandleMark hm;
-ResourceMark m;
-Disassembler().decode(this);
 }
 void nmethod::print_relocations() {
 ResourceMark m;       // in case methods get printed via the debugger
 for (PcDesc* p = scopes_pcs_begin(); p < scopes_pcs_end(); p++) {
 p->print(this);
 }
 }
+#endif // PRODUCT
 const char* nmethod::reloc_string_for(u_char* begin, u_char* end) {
 RelocIterator iter(this, begin, end);
 bool have_one = false;
 while (iter.next()) {
 }
 }
 return have_one ? "other" : NULL;
 }
 // Return a the last scope in (begin..end]
 ScopeDesc* nmethod::scope_desc_in(address begin, address end) {
 PcDesc* p = pc_desc_near(begin+1);
 if (p != NULL && p->real_pc(this) <= end) {
 return new ScopeDesc(this, p->scope_decode_offset(),
 for (int i = 0, imax = oms->size(); i < imax; i++) {
 OopMap* om = oms->at(i);
 address pc = base + om->offset();
 if (pc > begin) {
 if (pc <= end) {
-st->fill_to(column);
+st->move_to(column);
-if (st == tty) {
+st->print("; ");
-st->print("; OopMap ");
+om->print_on(st);
-om->print();
-tty->cr();
-} else {
-st->print_cr("; OopMap #%d offset:%d", i, om->offset());
-}
 }
 break;
 }
 }
 }
+// Print any debug info present at this pc.
 ScopeDesc* sd  = scope_desc_in(begin, end);
 if (sd != NULL) {
-st->fill_to(column);
+st->move_to(column);
 if (sd->bci() == SynchronizationEntryBCI) {
 st->print(";*synchronization entry");
 } else {
 if (sd->method().is_null()) {
-tty->print("method is NULL");
+st->print("method is NULL");
 } else if (sd->method()->is_native()) {
-tty->print("method is native");
+st->print("method is native");
 } else {
 address bcp  = sd->method()->bcp_from(sd->bci());
 Bytecodes::Code bc = Bytecodes::java_code_at(bcp);
 st->print(";*%s", Bytecodes::name(bc));
 switch (bc) {
 st->print("<UNKNOWN>");
 }
 }
 }
 }
-st->cr();
 // Print all scopes
 for (;sd != NULL; sd = sd->sender()) {
-st->fill_to(column);
+st->move_to(column);
 st->print("; -");
 if (sd->method().is_null()) {
-tty->print("method is NULL");
+st->print("method is NULL");
 } else {
 sd->method()->print_short_name(st);
 }
 int lineno = sd->method()->line_number_from_bci(sd->bci());
 if (lineno != -1) {
 // Print relocation information
 const char* str = reloc_string_for(begin, end);
 if (str != NULL) {
 if (sd != NULL) st->cr();
-st->fill_to(column);
+st->move_to(column);
 st->print(";   {%s}", str);
 }
 int cont_offset = ImplicitExceptionTable(this).at(begin - instructions_begin());
 if (cont_offset != 0) {
-st->fill_to(column);
+st->move_to(column);
 st->print("; implicit exception: dispatches to " INTPTR_FORMAT, instructions_begin() + cont_offset);
 }
 }
+#ifndef PRODUCT
 void nmethod::print_value_on(outputStream* st) const {
 print_on(st, "nmethod");
 }

changeset 347	df859fcca515
parent 203	2e348cc9121a
child 363	99d43e8a76ad