Move printing code to nmethod.cpp.

Author: TheRealMDoerr

src/hotspot/share/code/codeBlob.cpp

@@ -910,28 +910,7 @@ void CodeBlob::dump_for_addr(address addr, outputStream* st, bool verbose) const
       nm->print_nmethod(true);
     } else {
       nm->print_on(st);
-      if (nm->entry_point() <= addr && addr < nm->code_end()) {
-        // Pointing into an nmethod. Try to disassemble some instructions around addr.
-        address start = (addr < nm->verified_entry_point()) ? nm->entry_point() : nm->verified_entry_point();
-        address end = nm->code_end();
-        // Try using relocations to find known instruction start and end points.
-        // (Some platforms have variable length instructions and can only
-        // disassemble correctly at instruction start addresses.)
-        RelocIterator iter(nm, start);
-        while (iter.next() && iter.addr() < addr) { // find relocation before addr
-          start = iter.addr();
-        }
-        if (iter.has_current()) {
-          if (iter.addr() == addr) iter.next(); // find relocation after addr
-          if (iter.has_current()) end = iter.addr();
-        }
-
-        // Always print hex. Disassembler may still have problems if start is not a correct instruction start.
-        os::print_hex_dump(st, start, end, 1, /* print_ascii=*/false);
-        if (!Disassembler::is_abstract()) {
-          Disassembler::decode(start, end, st);
-        }
-      }
+      nm->print_code_snippet(st, addr);
     }
     return;
   }

src/hotspot/share/code/nmethod.cpp

@@ -3995,6 +3995,31 @@ void nmethod::print_value_on_impl(outputStream* st) const {
 #endif
 }
 
+void nmethod::print_code_snippet(outputStream* st, address addr) const {
+  if (entry_point() <= addr && addr < code_end()) {
+    // Pointing into the nmethod's code. Try to disassemble some instructions around addr.
+    address start = (addr < verified_entry_point()) ? entry_point() : verified_entry_point();
+    address end = code_end();
+    // Try using relocations to find known instruction start and end points.
+    // (Some platforms have variable length instructions and can only
+    // disassemble correctly at instruction start addresses.)
+    RelocIterator iter((nmethod*)this, start);
+    while (iter.next() && iter.addr() < addr) { // find relocation before addr
+      start = iter.addr();
+    }
+    if (iter.has_current()) {
+      if (iter.addr() == addr) iter.next(); // find relocation after addr
+      if (iter.has_current()) end = iter.addr();
+    }
+
+    // Always print hex. Disassembler may still have problems when hitting an incorrect instruction start.
+    os::print_hex_dump(st, start, end, 1, /* print_ascii=*/false);
+    if (!Disassembler::is_abstract()) {
+      Disassembler::decode(start, end, st);
+    }
+  }
+}
+
 #ifndef PRODUCT
 
 void nmethod::print_calls(outputStream* st) {

src/hotspot/share/code/nmethod.hpp

@@ -996,6 +996,7 @@ class nmethod : public CodeBlob {
   void print_on_impl(outputStream* st) const;
   void print_code();
   void print_value_on_impl(outputStream* st) const;
+  void print_code_snippet(outputStream* st, address addr) const;
 
 #if defined(SUPPORT_DATA_STRUCTS)
   // print output in opt build for disassembler library