Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/runtime/frame.cpp	Fri Jan 13 12:58:26 2012 -0800
     1.2 +++ b/src/share/vm/runtime/frame.cpp	Wed Jan 18 16:18:31 2012 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -1334,24 +1334,21 @@
    1.11  
    1.12  
    1.13  void frame::describe(FrameValues& values, int frame_no) {
    1.14 +  intptr_t* frame_pointer = real_fp();
    1.15    if (is_entry_frame() || is_compiled_frame() || is_interpreted_frame() || is_native_frame()) {
    1.16      // Label values common to most frames
    1.17      values.describe(-1, unextended_sp(), err_msg("unextended_sp for #%d", frame_no));
    1.18      values.describe(-1, sp(), err_msg("sp for #%d", frame_no));
    1.19 -    if (is_compiled_frame()) {
    1.20 -      values.describe(-1, sp() + _cb->frame_size(), err_msg("computed fp for #%d", frame_no));
    1.21 -    } else {
    1.22 -      values.describe(-1, fp(), err_msg("fp for #%d", frame_no));
    1.23 -    }
    1.24 +    values.describe(-1, frame_pointer, err_msg("frame pointer for #%d", frame_no));
    1.25    }
    1.26    if (is_interpreted_frame()) {
    1.27      methodOop m = interpreter_frame_method();
    1.28      int bci = interpreter_frame_bci();
    1.29  
    1.30      // Label the method and current bci
    1.31 -    values.describe(-1, MAX2(sp(), fp()),
    1.32 +    values.describe(-1, MAX2(sp(), frame_pointer),
    1.33                      FormatBuffer<1024>("#%d method %s @ %d", frame_no, m->name_and_sig_as_C_string(), bci), 2);
    1.34 -    values.describe(-1, MAX2(sp(), fp()),
    1.35 +    values.describe(-1, MAX2(sp(), frame_pointer),
    1.36                      err_msg("- %d locals %d max stack", m->max_locals(), m->max_stack()), 1);
    1.37      if (m->max_locals() > 0) {
    1.38        intptr_t* l0 = interpreter_frame_local_at(0);
    1.39 @@ -1383,18 +1380,18 @@
    1.40      }
    1.41    } else if (is_entry_frame()) {
    1.42      // For now just label the frame
    1.43 -    values.describe(-1, MAX2(sp(), fp()), err_msg("#%d entry frame", frame_no), 2);
    1.44 +    values.describe(-1, MAX2(sp(), frame_pointer), err_msg("#%d entry frame", frame_no), 2);
    1.45    } else if (is_compiled_frame()) {
    1.46      // For now just label the frame
    1.47      nmethod* nm = cb()->as_nmethod_or_null();
    1.48 -    values.describe(-1, MAX2(sp(), fp()),
    1.49 +    values.describe(-1, MAX2(sp(), frame_pointer),
    1.50                      FormatBuffer<1024>("#%d nmethod " INTPTR_FORMAT " for method %s%s", frame_no,
    1.51                                         nm, nm->method()->name_and_sig_as_C_string(),
    1.52                                         is_deoptimized_frame() ? " (deoptimized" : ""), 2);
    1.53    } else if (is_native_frame()) {
    1.54      // For now just label the frame
    1.55      nmethod* nm = cb()->as_nmethod_or_null();
    1.56 -    values.describe(-1, MAX2(sp(), fp()),
    1.57 +    values.describe(-1, MAX2(sp(), frame_pointer),
    1.58                      FormatBuffer<1024>("#%d nmethod " INTPTR_FORMAT " for native method %s", frame_no,
    1.59                                         nm, nm->method()->name_and_sig_as_C_string()), 2);
    1.60    }