Mercurial > hg > truffle
changeset 2280:a2babfb34c24
CiDebugInfo_Frame changed to CiFrame, pointer fix
| author | Lukas Stadler <lukas.stadler@jku.at> |
|---|---|
| date | Mon, 04 Apr 2011 18:47:04 +0200 |
| parents | 9aad24bf09ed |
| children | 0579225e0670 |
| files | src/share/vm/c1x/c1x_CodeInstaller.cpp src/share/vm/c1x/c1x_JavaAccess.hpp src/share/vm/classfile/systemDictionary.hpp src/share/vm/classfile/vmSymbols.hpp src/share/vm/runtime/os.cpp |
| diffstat | 5 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/c1x/c1x_CodeInstaller.cpp Mon Apr 04 10:56:12 2011 +0200 +++ b/src/share/vm/c1x/c1x_CodeInstaller.cpp Mon Apr 04 18:47:04 2011 +0200 @@ -395,7 +395,7 @@ record_scope(pc_offset, caller_pos); } oop frame = NULL; - if (code_pos->klass()->klass_part()->name() == vmSymbols::com_sun_cri_ci_CiDebugInfo_Frame()) { + if (code_pos->klass()->klass_part()->name() == vmSymbols::com_sun_cri_ci_CiFrame()) { frame = code_pos; } @@ -417,10 +417,10 @@ } if (frame != NULL) { - jint local_count = CiDebugInfo_Frame::numLocals(frame); - jint expression_count = CiDebugInfo_Frame::numStack(frame); - jint monitor_count = CiDebugInfo_Frame::numLocks(frame); - arrayOop values = (arrayOop) CiDebugInfo_Frame::values(frame); + jint local_count = CiFrame::numLocals(frame); + jint expression_count = CiFrame::numStack(frame); + jint monitor_count = CiFrame::numLocks(frame); + arrayOop values = (arrayOop) CiFrame::values(frame); assert(local_count + expression_count + monitor_count == values->length(), "unexpected values length");
--- a/src/share/vm/c1x/c1x_JavaAccess.hpp Mon Apr 04 10:56:12 2011 +0200 +++ b/src/share/vm/c1x/c1x_JavaAccess.hpp Mon Apr 04 18:47:04 2011 +0200 @@ -138,11 +138,11 @@ long_field(CiBitMap, low) \ oop_field(CiBitMap, extra, "[J") \ end_class \ - start_class(CiDebugInfo_Frame) \ - oop_field(CiDebugInfo_Frame, values, "[Lcom/sun/cri/ci/CiValue;") \ - int_field(CiDebugInfo_Frame, numLocals) \ - int_field(CiDebugInfo_Frame, numStack) \ - int_field(CiDebugInfo_Frame, numLocks) \ + start_class(CiFrame) \ + oop_field(CiFrame, values, "[Lcom/sun/cri/ci/CiValue;") \ + int_field(CiFrame, numLocals) \ + int_field(CiFrame, numStack) \ + int_field(CiFrame, numLocks) \ end_class \ start_class(CiCodePos) \ oop_field(CiCodePos, caller, "Lcom/sun/cri/ci/CiCodePos;") \
--- a/src/share/vm/classfile/systemDictionary.hpp Mon Apr 04 10:56:12 2011 +0200 +++ b/src/share/vm/classfile/systemDictionary.hpp Mon Apr 04 18:47:04 2011 +0200 @@ -204,7 +204,7 @@ template(CiTargetMethod_Mark_klass, com_sun_cri_ci_CiTargetMethod_Mark, Opt) \ template(CiBitMap_klass, com_sun_cri_ci_CiBitMap, Opt) \ template(CiDebugInfo_klass, com_sun_cri_ci_CiDebugInfo, Opt) \ - template(CiDebugInfo_Frame_klass, com_sun_cri_ci_CiDebugInfo_Frame, Opt) \ + template(CiFrame_klass, com_sun_cri_ci_CiFrame, Opt) \ template(CiValue_klass, com_sun_cri_ci_CiValue, Opt) \ template(CiStackSlot_klass, com_sun_cri_ci_CiStackSlot, Opt) \ template(CiRegisterValue_klass, com_sun_cri_ci_CiRegisterValue, Opt) \
--- a/src/share/vm/classfile/vmSymbols.hpp Mon Apr 04 10:56:12 2011 +0200 +++ b/src/share/vm/classfile/vmSymbols.hpp Mon Apr 04 18:47:04 2011 +0200 @@ -287,7 +287,7 @@ template(com_sun_cri_ci_CiTargetMethod_Mark, "com/sun/cri/ci/CiTargetMethod$Mark") \ template(com_sun_cri_ci_CiBitMap, "com/sun/cri/ci/CiBitMap") \ template(com_sun_cri_ci_CiDebugInfo, "com/sun/cri/ci/CiDebugInfo") \ - template(com_sun_cri_ci_CiDebugInfo_Frame, "com/sun/cri/ci/CiDebugInfo$Frame") \ + template(com_sun_cri_ci_CiFrame, "com/sun/cri/ci/CiFrame") \ template(com_sun_cri_ci_CiValue, "com/sun/cri/ci/CiValue") \ template(com_sun_cri_ci_CiStackSlot, "com/sun/cri/ci/CiStackSlot") \ template(com_sun_cri_ci_CiRegisterValue, "com/sun/cri/ci/CiRegisterValue") \
--- a/src/share/vm/runtime/os.cpp Mon Apr 04 10:56:12 2011 +0200 +++ b/src/share/vm/runtime/os.cpp Mon Apr 04 18:47:04 2011 +0200 @@ -633,10 +633,10 @@ *q = (u_char)freeBlockPad; } if (PrintMalloc && tty != NULL) - fprintf(stderr, "os::free " SIZE_FORMAT " bytes --> " PTR_FORMAT "\n", size, memblock); + fprintf(stderr, "os::free " SIZE_FORMAT " bytes --> " PTR_FORMAT "\n", size, (intptr_t)memblock); } else if (PrintMalloc && tty != NULL) { // tty->print_cr("os::free %p", memblock); - fprintf(stderr, "os::free " PTR_FORMAT "\n", memblock); + fprintf(stderr, "os::free " PTR_FORMAT "\n", (intptr_t)memblock); } #endif ::free((char*)memblock - space_before);