src/share/vm/runtime/frame.cpp

*** 21,30 ****
--- 21,31 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "compiler/abstractCompiler.hpp"
  #include "compiler/disassembler.hpp"
  #include "gc_interface/collectedHeap.inline.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/oopMapCache.hpp"
  #include "memory/resourceArea.hpp"
*** 557,567 ****
    NOT_PRODUCT(address begin = pc()-40;)
    NOT_PRODUCT(address end   = NULL;)
  
    st->print("%s frame (sp=" INTPTR_FORMAT " unextended sp=" INTPTR_FORMAT, print_name(), sp(), unextended_sp());
    if (sp() != NULL)
!     st->print(", fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT, fp(), pc());
  
    if (StubRoutines::contains(pc())) {
      st->print_cr(")");
      st->print("(");
      StubCodeDesc* desc = StubCodeDesc::desc_for(pc());
--- 558,568 ----
    NOT_PRODUCT(address begin = pc()-40;)
    NOT_PRODUCT(address end   = NULL;)
  
    st->print("%s frame (sp=" INTPTR_FORMAT " unextended sp=" INTPTR_FORMAT, print_name(), sp(), unextended_sp());
    if (sp() != NULL)
!     st->print(", fp=" INTPTR_FORMAT ", real_fp=" INTPTR_FORMAT ", pc=" INTPTR_FORMAT, fp(), real_fp(), pc());
  
    if (StubRoutines::contains(pc())) {
      st->print_cr(")");
      st->print("(");
      StubCodeDesc* desc = StubCodeDesc::desc_for(pc());
*** 718,732 ****
          st->print("v  ~StubRoutines::" PTR_FORMAT, pc());
        }
      } else if (_cb->is_buffer_blob()) {
        st->print("v  ~BufferBlob::%s", ((BufferBlob *)_cb)->name());
      } else if (_cb->is_nmethod()) {
!       Method* m = ((nmethod *)_cb)->method();
        if (m != NULL) {
          m->name_and_sig_as_C_string(buf, buflen);
!         st->print("J  %s @ " PTR_FORMAT " [" PTR_FORMAT "+" SIZE_FORMAT "]",
!                   buf, _pc, _cb->code_begin(), _pc - _cb->code_begin());
        } else {
          st->print("J  " PTR_FORMAT, pc());
        }
      } else if (_cb->is_runtime_stub()) {
        st->print("v  ~RuntimeStub::%s", ((RuntimeStub *)_cb)->name());
--- 719,736 ----
          st->print("v  ~StubRoutines::" PTR_FORMAT, pc());
        }
      } else if (_cb->is_buffer_blob()) {
        st->print("v  ~BufferBlob::%s", ((BufferBlob *)_cb)->name());
      } else if (_cb->is_nmethod()) {
!       nmethod* nm = (nmethod*)_cb;
!       Method* m = nm->method();
        if (m != NULL) {
          m->name_and_sig_as_C_string(buf, buflen);
!         st->print("J %d%s %s %s (%d bytes) @ " PTR_FORMAT " [" PTR_FORMAT "+0x%x]",
!                   nm->compile_id(), (nm->is_osr_method() ? "%" : ""),
!                   ((nm->compiler() > 0) ? nm->compiler()->name() : ""),
!                   buf, m->code_size(), _pc, _cb->code_begin(), _pc - _cb->code_begin());
        } else {
          st->print("J  " PTR_FORMAT, pc());
        }
      } else if (_cb->is_runtime_stub()) {
        st->print("v  ~RuntimeStub::%s", ((RuntimeStub *)_cb)->name());