Mercurial > hg > truffle
changeset 2281:0579225e0670
Merge.
| author | Thomas Wuerthinger <thomas@wuerthinger.net> |
|---|---|
| date | Mon, 04 Apr 2011 20:00:55 +0200 |
| parents | 017f3eeb2901 (current diff) a2babfb34c24 (diff) |
| children | 0309d394eb5f |
| files | |
| diffstat | 12 files changed, 46 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/Compiler.java Thu Mar 03 19:54:57 2011 +0100 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/Compiler.java Mon Apr 04 20:00:55 2011 +0200 @@ -159,7 +159,7 @@ return vmExits; } - private final CiCompiler compiler; + private final C1XCompiler compiler; private final HotSpotVMConfig config; private final HotSpotRuntime runtime; private final HotSpotRegisterConfig registerConfig; @@ -190,7 +190,7 @@ C1XOptions.StackShadowPages = config.stackShadowPages; } - public CiCompiler getCompiler() { + public C1XCompiler getCompiler() { return compiler; }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotExceptionHandler.java Thu Mar 03 19:54:57 2011 +0100 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotExceptionHandler.java Mon Apr 04 20:00:55 2011 +0200 @@ -46,7 +46,7 @@ } @Override - public int catchClassIndex() { + public int catchTypeCPI() { return catchClassIndex; } @@ -56,7 +56,7 @@ } @Override - public RiType catchKlass() { + public RiType catchType() { return catchClass; }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java Thu Mar 03 19:54:57 2011 +0100 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodResolved.java Mon Apr 04 20:00:55 2011 +0200 @@ -184,4 +184,9 @@ public int intrinsic() { return 0; } + + @Override + public boolean minimalDebugInfo() { + return false; + } }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java Thu Mar 03 19:54:57 2011 +0100 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/HotSpotMethodUnresolved.java Mon Apr 04 20:00:55 2011 +0200 @@ -132,6 +132,11 @@ throw unresolved("exceptionHandlers"); } + @Override + public boolean minimalDebugInfo() { + throw unresolved("minimalDebugInfo"); + } + private CiUnresolvedException unresolved(String operation) { return new CiUnresolvedException(operation + " not defined for unresolved method " + name); }
--- a/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/VMExitsNative.java Thu Mar 03 19:54:57 2011 +0100 +++ b/c1x4hotspotsrc/HotSpotVM/src/com/sun/hotspot/c1x/VMExitsNative.java Mon Apr 04 20:00:55 2011 +0200 @@ -129,7 +129,7 @@ try { Compiler compiler = Compiler.getInstance(); HotSpotMethodResolved riMethod = new HotSpotMethodResolved(methodVmId, name); - CiResult result = compiler.getCompiler().compileMethod(riMethod, -1, null); + CiResult result = compiler.getCompiler().compileMethod(riMethod, -1, null, null); if (LogCompiledMethods) { String qualifiedName = CiUtil.toJavaName(riMethod.holder()) + "::" + riMethod.name(); compiledMethods.add(qualifiedName);
--- a/c1x4hotspotsrc/hotspot/.project Thu Mar 03 19:54:57 2011 +0100 +++ b/c1x4hotspotsrc/hotspot/.project Mon Apr 04 20:00:55 2011 +0200 @@ -106,6 +106,11 @@ <locationURI>PARENT-2-PROJECT_LOC/src/os_cpu/linux_x86</locationURI> </link> <link> + <name>src</name> + <type>2</type> + <locationURI>PARENT-2-PROJECT_LOC/src</locationURI> + </link> + <link> <name>vm</name> <type>2</type> <locationURI>PARENT-2-PROJECT_LOC/src/share/vm</locationURI>
--- a/domake Thu Mar 03 19:54:57 2011 +0100 +++ b/domake Mon Apr 04 20:00:55 2011 +0200 @@ -34,6 +34,18 @@ ln -s $JDK7/jre/bin/java $java_link fi +client_dir=$JDK7/jre/lib/amd64/client +if [ ! -e $client_dir ]; then + echo "Creating client compiler dir: $client_dir" + mkdir $client_dir +fi + +client_dir=$JDK7G/jre/lib/amd64/client +if [ ! -e $client_dir ]; then + echo "Creating debug client compiler dir: $client_dir" + mkdir $client_dir +fi + pushd $graal_home/make ARCH_DATA_MODEL=64 LANG=C HOTSPOT_BUILD_JOBS=4 ALT_BOOTDIR=$JDK7G INSTALL=$JDK7G/jre make jvmg1
--- a/src/share/vm/c1x/c1x_CodeInstaller.cpp Thu Mar 03 19:54:57 2011 +0100 +++ b/src/share/vm/c1x/c1x_CodeInstaller.cpp Mon Apr 04 20:00:55 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 Thu Mar 03 19:54:57 2011 +0100 +++ b/src/share/vm/c1x/c1x_JavaAccess.hpp Mon Apr 04 20:00:55 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 Thu Mar 03 19:54:57 2011 +0100 +++ b/src/share/vm/classfile/systemDictionary.hpp Mon Apr 04 20:00:55 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 Thu Mar 03 19:54:57 2011 +0100 +++ b/src/share/vm/classfile/vmSymbols.hpp Mon Apr 04 20:00:55 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 Thu Mar 03 19:54:57 2011 +0100 +++ b/src/share/vm/runtime/os.cpp Mon Apr 04 20:00:55 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);