Mercurial > hg > graal-jvmci-8
changeset 14912:898e6a259f67
merge
| author | Michael Haupt <michael.haupt@oracle.com> |
|---|---|
| date | Tue, 01 Apr 2014 15:15:28 +0200 |
| parents | 0fd2e8835ef0 (diff) 954c9df6ac79 (current diff) |
| children | 2d1cc640512c |
| files | agent/src/share/classes/sun/jvm/hotspot/memory/AdaptiveFreeList.java make/aix/Makefile make/aix/adlc_updater make/aix/makefiles/adjust-mflags.sh make/aix/makefiles/adlc.make make/aix/makefiles/build_vm_def.sh make/aix/makefiles/buildtree.make make/aix/makefiles/compiler2.make make/aix/makefiles/core.make make/aix/makefiles/debug.make make/aix/makefiles/defs.make make/aix/makefiles/dtrace.make make/aix/makefiles/fastdebug.make make/aix/makefiles/jsig.make make/aix/makefiles/jvmti.make make/aix/makefiles/mapfile-vers-debug make/aix/makefiles/mapfile-vers-jsig make/aix/makefiles/mapfile-vers-product make/aix/makefiles/ppc64.make make/aix/makefiles/product.make make/aix/makefiles/rules.make make/aix/makefiles/sa.make make/aix/makefiles/saproc.make make/aix/makefiles/top.make make/aix/makefiles/trace.make make/aix/makefiles/vm.make make/aix/makefiles/xlc.make make/aix/platform_ppc64 make/bsd/makefiles/mapfile-vers-darwin-debug make/bsd/makefiles/mapfile-vers-darwin-product make/linux/makefiles/ppc64.make make/linux/platform_ppc64 src/cpu/ppc/vm/assembler_ppc.cpp src/cpu/ppc/vm/assembler_ppc.hpp src/cpu/ppc/vm/assembler_ppc.inline.hpp src/cpu/ppc/vm/bytecodeInterpreter_ppc.hpp src/cpu/ppc/vm/bytecodeInterpreter_ppc.inline.hpp src/cpu/ppc/vm/bytecodes_ppc.cpp src/cpu/ppc/vm/bytecodes_ppc.hpp src/cpu/ppc/vm/bytes_ppc.hpp src/cpu/ppc/vm/c2_globals_ppc.hpp src/cpu/ppc/vm/c2_init_ppc.cpp src/cpu/ppc/vm/codeBuffer_ppc.hpp src/cpu/ppc/vm/compiledIC_ppc.cpp src/cpu/ppc/vm/copy_ppc.hpp src/cpu/ppc/vm/cppInterpreterGenerator_ppc.hpp src/cpu/ppc/vm/cppInterpreter_ppc.cpp src/cpu/ppc/vm/cppInterpreter_ppc.hpp src/cpu/ppc/vm/debug_ppc.cpp src/cpu/ppc/vm/depChecker_ppc.hpp src/cpu/ppc/vm/disassembler_ppc.hpp src/cpu/ppc/vm/frame_ppc.cpp src/cpu/ppc/vm/frame_ppc.hpp src/cpu/ppc/vm/frame_ppc.inline.hpp src/cpu/ppc/vm/globalDefinitions_ppc.hpp src/cpu/ppc/vm/globals_ppc.hpp src/cpu/ppc/vm/icBuffer_ppc.cpp src/cpu/ppc/vm/icache_ppc.cpp src/cpu/ppc/vm/icache_ppc.hpp src/cpu/ppc/vm/interp_masm_ppc_64.cpp src/cpu/ppc/vm/interp_masm_ppc_64.hpp src/cpu/ppc/vm/interpreterGenerator_ppc.hpp src/cpu/ppc/vm/interpreterRT_ppc.cpp src/cpu/ppc/vm/interpreterRT_ppc.hpp src/cpu/ppc/vm/interpreter_ppc.cpp src/cpu/ppc/vm/interpreter_ppc.hpp src/cpu/ppc/vm/javaFrameAnchor_ppc.hpp src/cpu/ppc/vm/jniFastGetField_ppc.cpp src/cpu/ppc/vm/jniTypes_ppc.hpp src/cpu/ppc/vm/jni_ppc.h src/cpu/ppc/vm/macroAssembler_ppc.cpp src/cpu/ppc/vm/macroAssembler_ppc.hpp src/cpu/ppc/vm/macroAssembler_ppc.inline.hpp src/cpu/ppc/vm/metaspaceShared_ppc.cpp src/cpu/ppc/vm/methodHandles_ppc.cpp src/cpu/ppc/vm/methodHandles_ppc.hpp src/cpu/ppc/vm/nativeInst_ppc.cpp src/cpu/ppc/vm/nativeInst_ppc.hpp src/cpu/ppc/vm/ppc.ad src/cpu/ppc/vm/ppc_64.ad src/cpu/ppc/vm/registerMap_ppc.hpp src/cpu/ppc/vm/register_definitions_ppc.cpp src/cpu/ppc/vm/register_ppc.cpp src/cpu/ppc/vm/register_ppc.hpp src/cpu/ppc/vm/relocInfo_ppc.cpp src/cpu/ppc/vm/relocInfo_ppc.hpp src/cpu/ppc/vm/runtime_ppc.cpp src/cpu/ppc/vm/sharedRuntime_ppc.cpp src/cpu/ppc/vm/stubGenerator_ppc.cpp src/cpu/ppc/vm/stubRoutines_ppc_64.cpp src/cpu/ppc/vm/stubRoutines_ppc_64.hpp src/cpu/ppc/vm/vmStructs_ppc.hpp src/cpu/ppc/vm/vm_version_ppc.cpp src/cpu/ppc/vm/vm_version_ppc.hpp src/cpu/ppc/vm/vmreg_ppc.cpp src/cpu/ppc/vm/vmreg_ppc.hpp src/cpu/ppc/vm/vmreg_ppc.inline.hpp src/cpu/ppc/vm/vtableStubs_ppc_64.cpp src/os/aix/vm/attachListener_aix.cpp src/os/aix/vm/c2_globals_aix.hpp src/os/aix/vm/decoder_aix.hpp src/os/aix/vm/globals_aix.hpp src/os/aix/vm/interfaceSupport_aix.hpp src/os/aix/vm/jsig.c src/os/aix/vm/jvm_aix.cpp src/os/aix/vm/jvm_aix.h src/os/aix/vm/libperfstat_aix.cpp src/os/aix/vm/libperfstat_aix.hpp src/os/aix/vm/loadlib_aix.cpp src/os/aix/vm/loadlib_aix.hpp src/os/aix/vm/mutex_aix.inline.hpp src/os/aix/vm/osThread_aix.cpp src/os/aix/vm/osThread_aix.hpp src/os/aix/vm/os_aix.cpp src/os/aix/vm/os_aix.hpp src/os/aix/vm/os_aix.inline.hpp src/os/aix/vm/os_share_aix.hpp src/os/aix/vm/perfMemory_aix.cpp src/os/aix/vm/porting_aix.cpp src/os/aix/vm/porting_aix.hpp src/os/aix/vm/threadCritical_aix.cpp src/os/aix/vm/thread_aix.inline.hpp src/os/aix/vm/vmError_aix.cpp src/os/posix/dtrace/hotspot.d src/os/posix/dtrace/hotspot_jni.d src/os/posix/dtrace/hs_private.d src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp src/os_cpu/aix_ppc/vm/orderAccess_aix_ppc.inline.hpp src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp src/os_cpu/aix_ppc/vm/os_aix_ppc.hpp src/os_cpu/aix_ppc/vm/prefetch_aix_ppc.inline.hpp src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.cpp src/os_cpu/aix_ppc/vm/threadLS_aix_ppc.hpp src/os_cpu/aix_ppc/vm/thread_aix_ppc.cpp src/os_cpu/aix_ppc/vm/thread_aix_ppc.hpp src/os_cpu/aix_ppc/vm/vmStructs_aix_ppc.hpp src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp src/os_cpu/linux_ppc/vm/orderAccess_linux_ppc.inline.hpp src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp src/os_cpu/linux_ppc/vm/os_linux_ppc.hpp src/os_cpu/linux_ppc/vm/prefetch_linux_ppc.inline.hpp src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.cpp src/os_cpu/linux_ppc/vm/threadLS_linux_ppc.hpp src/os_cpu/linux_ppc/vm/thread_linux_ppc.cpp src/os_cpu/linux_ppc/vm/thread_linux_ppc.hpp src/os_cpu/linux_ppc/vm/vmStructs_linux_ppc.hpp src/share/vm/gc_implementation/g1/bufferingOopClosure.cpp src/share/vm/gc_implementation/g1/g1OopClosures.cpp src/share/vm/interpreter/bytecodeInterpreterProfiling.hpp src/share/vm/utilities/dtrace_disabled.hpp src/share/vm/utilities/elfFuncDescTable.cpp src/share/vm/utilities/elfFuncDescTable.hpp src/share/vm/utilities/globalDefinitions_xlc.hpp test/compiler/codegen/LoadWithMask.java test/compiler/codegen/LoadWithMask2.java test/compiler/debug/VerifyAdapterSharing.java test/compiler/inlining/DefaultAndConcreteMethodsCHA.java test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java test/compiler/intrinsics/mathexact/sanity/MathIntrinsic.java test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java test/compiler/intrinsics/mathexact/sanity/Verifier.java test/compiler/startup/NumCompilerThreadsCheck.java test/compiler/types/TestMeetTopArrayExactConstantArray.java test/compiler/types/TestSpeculationFailedHigherEqual.java test/compiler/uncommontrap/StackOverflowGuardPagesOff.java test/compiler/uncommontrap/TestLockEliminatedAtDeopt.java test/compiler/uncommontrap/TestSpecTrapClassUnloading.java test/gc/TestVerifySilently.java test/gc/defnew/HeapChangeLogging.java test/gc/g1/Test2GbHeap.java test/gc/g1/TestStringSymbolTableStats.java test/runtime/ClassFile/UnsupportedClassFileVersion.java test/runtime/CommandLine/VMOptionWarning.java test/runtime/PerfMemDestroy/PerfMemDestroy.java test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java test/runtime/SharedArchiveFile/CdsWriteError.java test/runtime/SharedArchiveFile/DefaultUseWithClient.java test/runtime/finalStatic/FinalStatic.java test/runtime/lambda-features/InvokespecialInterface.java test/runtime/lambda-features/TestConcreteClassWithAbstractMethod.java test/serviceability/dcmd/DcmdUtil.java test/serviceability/dcmd/DynLibDcmdTest.java test/serviceability/sa/jmap-hashcode/Test8028623.java |
| diffstat | 2 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java Fri Mar 28 10:46:18 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java Tue Apr 01 15:15:28 2014 +0200 @@ -91,6 +91,8 @@ @Override public abstract Object call(PackedFrame caller, Arguments args); + public abstract InstalledCode compile(); + public Object callInlined(PackedFrame caller, Arguments arguments) { if (CompilerDirectives.inInterpreter()) { compilationProfile.reportInlinedCall();
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTargetImpl.java Fri Mar 28 10:46:18 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTargetImpl.java Tue Apr 01 15:15:28 2014 +0200 @@ -136,6 +136,7 @@ return false; } + @Override public InstalledCode compile() { if (isCompiling()) { if (installedCodeTask.isDone()) {