comparison src/share/vm/runtime/frame.cpp @ 14396:583211d4b16b

Merge
author kvn
date Wed, 03 Jul 2013 11:50:29 -0700
parents b5c8a61d7fa0 e0c9a1d29eb4
children 94c202aa2646
comparison
equal deleted inserted replaced
14395:48d3d0eb193b 14396:583211d4b16b
385 } 385 }
386 386
387 Method* frame::interpreter_frame_method() const { 387 Method* frame::interpreter_frame_method() const {
388 assert(is_interpreted_frame(), "interpreted frame expected"); 388 assert(is_interpreted_frame(), "interpreted frame expected");
389 Method* m = *interpreter_frame_method_addr(); 389 Method* m = *interpreter_frame_method_addr();
390 assert(m->is_metadata(), "bad Method* in interpreter frame");
391 assert(m->is_method(), "not a Method*"); 390 assert(m->is_method(), "not a Method*");
392 return m; 391 return m;
393 } 392 }
394 393
395 void frame::interpreter_frame_set_method(Method* method) { 394 void frame::interpreter_frame_set_method(Method* method) {
711 st->print("v ~BufferBlob::%s", ((BufferBlob *)_cb)->name()); 710 st->print("v ~BufferBlob::%s", ((BufferBlob *)_cb)->name());
712 } else if (_cb->is_nmethod()) { 711 } else if (_cb->is_nmethod()) {
713 Method* m = ((nmethod *)_cb)->method(); 712 Method* m = ((nmethod *)_cb)->method();
714 if (m != NULL) { 713 if (m != NULL) {
715 m->name_and_sig_as_C_string(buf, buflen); 714 m->name_and_sig_as_C_string(buf, buflen);
716 st->print("J %s", buf); 715 st->print("J %s @ " PTR_FORMAT " [" PTR_FORMAT "+" SIZE_FORMAT "]",
716 buf, _pc, _cb->code_begin(), _pc - _cb->code_begin());
717 } else { 717 } else {
718 st->print("J " PTR_FORMAT, pc()); 718 st->print("J " PTR_FORMAT, pc());
719 } 719 }
720 } else if (_cb->is_runtime_stub()) { 720 } else if (_cb->is_runtime_stub()) {
721 st->print("v ~RuntimeStub::%s", ((RuntimeStub *)_cb)->name()); 721 st->print("v ~RuntimeStub::%s", ((RuntimeStub *)_cb)->name());