truffle: src/share/vm/runtime/frame.cpp comparison

comparison src/share/vm/runtime/frame.cpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/

author	Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date	Mon, 27 Feb 2012 13:10:13 +0100
parents	84e7d6690293 aa3d708d67c4
children	28577a53d3a7

comparison

equal deleted inserted replaced

-:2cfb7fb2dce7
+:33df1aeaebbf
 /*
-* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 st->print_cr(")");
 st->print("(");
 InterpreterCodelet* desc = Interpreter::codelet_containing(pc());
 if (desc != NULL) {
 st->print("~");
-desc->print();
+desc->print_on(st);
 NOT_PRODUCT(begin = desc->code_begin(); end = desc->code_end();)
 } else {
 st->print("~interpreter");
 }
 }
 }
 return false;
 }
 #endif
 #ifdef ASSERT
 void frame::interpreter_frame_verify_monitor(BasicObjectLock* value) const {
 assert(is_interpreted_frame(), "Not an interpreted frame");
 // verify that the value is in the right part of the frame
 address low_mark  = (address) interpreter_frame_monitor_end();
 guarantee( high_mark > current                                , "Current BasicObjectLock* higher than high_mark");
 guarantee((current - low_mark) % monitor_size  ==  0         , "Misaligned bottom of BasicObjectLock*");
 guarantee( current >= low_mark                               , "Current BasicObjectLock* below than low_mark");
 }
+#endif
+#ifndef PRODUCT
 void frame::describe(FrameValues& values, int frame_no) {
+// boundaries: sp and the 'real' frame pointer
+values.describe(-1, sp(), err_msg("sp for #%d", frame_no), 1);
+intptr_t* frame_pointer = real_fp(); // Note: may differ from fp()
+// print frame info at the highest boundary
+intptr_t* info_address = MAX2(sp(), frame_pointer);
+if (info_address != frame_pointer) {
+// print frame_pointer explicitly if not marked by the frame info
+values.describe(-1, frame_pointer, err_msg("frame pointer for #%d", frame_no), 1);
+}
 if (is_entry_frame() || is_compiled_frame() || is_interpreted_frame() || is_native_frame()) {
 // Label values common to most frames
 values.describe(-1, unextended_sp(), err_msg("unextended_sp for #%d", frame_no));
-values.describe(-1, sp(), err_msg("sp for #%d", frame_no));
+}
-if (is_compiled_frame()) {
-values.describe(-1, sp() + _cb->frame_size(), err_msg("computed fp for #%d", frame_no));
-} else {
-values.describe(-1, fp(), err_msg("fp for #%d", frame_no));
-}
-}
 if (is_interpreted_frame()) {
 methodOop m = interpreter_frame_method();
 int bci = interpreter_frame_bci();
 // Label the method and current bci
-values.describe(-1, MAX2(sp(), fp()),
+values.describe(-1, info_address,
 FormatBuffer<1024>("#%d method %s @ %d", frame_no, m->name_and_sig_as_C_string(), bci), 2);
-values.describe(-1, MAX2(sp(), fp()),
+values.describe(-1, info_address,
 err_msg("- %d locals %d max stack", m->max_locals(), m->max_stack()), 1);
 if (m->max_locals() > 0) {
 intptr_t* l0 = interpreter_frame_local_at(0);
 intptr_t* ln = interpreter_frame_local_at(m->max_locals() - 1);
 values.describe(-1, MAX2(l0, ln), err_msg("locals for #%d", frame_no), 1);
 values.describe(frame_no, (intptr_t*)interpreter_frame_monitor_begin(), "monitors begin");
 values.describe(frame_no, (intptr_t*)interpreter_frame_monitor_end(), "monitors end");
 }
 } else if (is_entry_frame()) {
 // For now just label the frame
-values.describe(-1, MAX2(sp(), fp()), err_msg("#%d entry frame", frame_no), 2);
+values.describe(-1, info_address, err_msg("#%d entry frame", frame_no), 2);
 } else if (is_compiled_frame()) {
 // For now just label the frame
 nmethod* nm = cb()->as_nmethod_or_null();
-values.describe(-1, MAX2(sp(), fp()),
+values.describe(-1, info_address,
 FormatBuffer<1024>("#%d nmethod " INTPTR_FORMAT " for method %s%s", frame_no,
 nm, nm->method()->name_and_sig_as_C_string(),
-is_deoptimized_frame() ? " (deoptimized" : ""), 2);
+(_deopt_state == is_deoptimized) ?
+" (deoptimized)" :
+((_deopt_state == unknown) ? " (state unknown)" : "")),
+2);
 } else if (is_native_frame()) {
 // For now just label the frame
 nmethod* nm = cb()->as_nmethod_or_null();
-values.describe(-1, MAX2(sp(), fp()),
+values.describe(-1, info_address,
 FormatBuffer<1024>("#%d nmethod " INTPTR_FORMAT " for native method %s", frame_no,
 nm, nm->method()->name_and_sig_as_C_string()), 2);
-}
+} else if (is_ricochet_frame()) {
+values.describe(-1, info_address, err_msg("#%d ricochet frame", frame_no), 2);
+} else {
+// provide default info if not handled before
+char *info = (char *) "special frame";
+if ((_cb != NULL) &&
+(_cb->name() != NULL)) {
+info = (char *)_cb->name();
+}
+values.describe(-1, info_address, err_msg("#%d <%s>", frame_no, info), 2);
+}
+// platform dependent additional data
 describe_pd(values, frame_no);
 }
 #endif
 _fr = thread->last_frame();
 _is_done = false;
 }
-#ifdef ASSERT
+#ifndef PRODUCT
 void FrameValues::describe(int owner, intptr_t* location, const char* description, int priority) {
 FrameValue fv;
 fv.location = location;
 fv.owner = owner;
 strcpy(fv.description, description);
 _values.append(fv);
 }
+#ifdef ASSERT
 void FrameValues::validate() {
 _values.sort(compare);
 bool error = false;
 FrameValue prev;
 prev.owner = -1;
 prev = fv;
 }
 }
 assert(!error, "invalid layout");
 }
+#endif // ASSERT
 void FrameValues::print(JavaThread* thread) {
 _values.sort(compare);
 // Sometimes values like the fp can be invalid values if the
 cur--;
 }
 }
 }
-#endif
+#endif // ndef PRODUCT

Mercurial > hg > truffle

comparison src/share/vm/runtime/frame.cpp @ 4970:33df1aeaebbf