From nicolas.geoffray at gmail.com Fri Dec 21 14:44:29 2012 From: nicolas.geoffray at gmail.com (Nicolas Geoffray) Date: Fri, 21 Dec 2012 22:44:29 -0000 Subject: [vmkit-commits] [vmkit] r170943 - in /vmkit/trunk/lib/j3/Compiler: JavaLLVMCompiler.cpp LLVMInfo.cpp Message-ID: <20121221224429.93B3F2A6C065@llvm.org> Author: geoffray Date: Fri Dec 21 16:44:29 2012 New Revision: 170943 URL: http://llvm.org/viewvc/llvm-project?rev=170943&view=rev Log: Bugfix when a non-customized version was becoming a customized one. If the LLVMInfo does not know if the method is customizable, don't try to customize it. Modified: vmkit/trunk/lib/j3/Compiler/JavaLLVMCompiler.cpp vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp Modified: vmkit/trunk/lib/j3/Compiler/JavaLLVMCompiler.cpp URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaLLVMCompiler.cpp?rev=170943&r1=170942&r2=170943&view=diff ============================================================================== --- vmkit/trunk/lib/j3/Compiler/JavaLLVMCompiler.cpp (original) +++ vmkit/trunk/lib/j3/Compiler/JavaLLVMCompiler.cpp Fri Dec 21 16:44:29 2012 @@ -61,7 +61,7 @@ // We are jitting. Take the lock. vmkit::VmkitModule::protectIR(); if (func->getLinkage() == GlobalValue::ExternalWeakLinkage) { - JavaJIT jit(this, meth, func, customizeFor); + JavaJIT jit(this, meth, func, LMI->isCustomizable? customizeFor : NULL); if (isNative(meth->access)) { jit.nativeCompile(); vmkit::VmkitModule::runPasses(func, JavaNativeFunctionPasses); @@ -75,11 +75,9 @@ if (!LMI->isCustomizable && jit.isCustomizable) { // It's the first time we parsed the method and we just found // out it can be customized. + // TODO(geoffray): return a customized version to this caller. meth->isCustomizable = true; LMI->isCustomizable = true; - if (customizeFor != NULL) { - LMI->setCustomizedVersion(customizeFor, func); - } } } vmkit::VmkitModule::unprotectIR(); Modified: vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp?rev=170943&r1=170942&r2=170943&view=diff ============================================================================== --- vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp (original) +++ vmkit/trunk/lib/j3/Compiler/LLVMInfo.cpp Fri Dec 21 16:44:29 2012 @@ -209,17 +209,6 @@ return result; } -void LLVMMethodInfo::setCustomizedVersion(Class* cl, llvm::Function* F) { - assert(customizedVersions.size() == 0); - vmkit::ThreadAllocator allocator; - if (Compiler->emitFunctionName()) { - char* buf = GetMethodName(allocator, methodDef, cl); - F->setName(buf); - } - methodFunction = NULL; - customizedVersions[cl] = F; -} - FunctionType* LLVMMethodInfo::getFunctionType() { if (!functionType) { Signdef* sign = methodDef->getSignature(); From nicolas.geoffray at gmail.com Fri Dec 21 15:01:21 2012 From: nicolas.geoffray at gmail.com (Nicolas Geoffray) Date: Fri, 21 Dec 2012 23:01:21 -0000 Subject: [vmkit-commits] [vmkit] r170949 - in /vmkit/trunk/lib/j3/VMCore: JavaThread.h Jni.cpp Message-ID: <20121221230121.CAC4E2A6C065@llvm.org> Author: geoffray Date: Fri Dec 21 17:01:21 2012 New Revision: 170949 URL: http://llvm.org/viewvc/llvm-project?rev=170949&view=rev Log: throwFromJni does not need to end known frame and enter uncooperative code. The following RETURN_FROM_JNI will do it. Modified: vmkit/trunk/lib/j3/VMCore/JavaThread.h vmkit/trunk/lib/j3/VMCore/Jni.cpp Modified: vmkit/trunk/lib/j3/VMCore/JavaThread.h URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaThread.h?rev=170949&r1=170948&r2=170949&view=diff ============================================================================== --- vmkit/trunk/lib/j3/VMCore/JavaThread.h (original) +++ vmkit/trunk/lib/j3/VMCore/JavaThread.h Fri Dec 21 17:01:21 2012 @@ -156,8 +156,7 @@ /// throwFromJNI - Throw an exception after executing JNI code. /// void throwFromJNI(word_t SP) { - endKnownFrame(); - enterUncooperativeCode(SP); + // Nothing to do. The RETURN_FROM_JNI will take care of it. } /// throwFromNative - Throw an exception after executing Native code. Modified: vmkit/trunk/lib/j3/VMCore/Jni.cpp URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/Jni.cpp?rev=170949&r1=170948&r2=170949&view=diff ============================================================================== --- vmkit/trunk/lib/j3/VMCore/Jni.cpp (original) +++ vmkit/trunk/lib/j3/VMCore/Jni.cpp Fri Dec 21 17:01:21 2012 @@ -459,7 +459,7 @@ END_JNI_EXCEPTION - return JNI_FALSE; + RETURN_FROM_JNI(0); } From nicolas.geoffray at gmail.com Fri Dec 21 15:23:48 2012 From: nicolas.geoffray at gmail.com (Nicolas Geoffray) Date: Fri, 21 Dec 2012 23:23:48 -0000 Subject: [vmkit-commits] [vmkit] r170957 - in /vmkit/branches/release_032: ./ lib/j3/Compiler/JavaLLVMCompiler.cpp lib/j3/Compiler/LLVMInfo.cpp lib/j3/VMCore/JavaThread.h lib/j3/VMCore/Jni.cpp Message-ID: <20121221232348.7925C2A6C065@llvm.org> Author: geoffray Date: Fri Dec 21 17:23:48 2012 New Revision: 170957 URL: http://llvm.org/viewvc/llvm-project?rev=170957&view=rev Log: Merge with trunk. Modified: vmkit/branches/release_032/ (props changed) vmkit/branches/release_032/lib/j3/Compiler/JavaLLVMCompiler.cpp vmkit/branches/release_032/lib/j3/Compiler/LLVMInfo.cpp vmkit/branches/release_032/lib/j3/VMCore/JavaThread.h vmkit/branches/release_032/lib/j3/VMCore/Jni.cpp Propchange: vmkit/branches/release_032/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 21 17:23:48 2012 @@ -1,2 +1,3 @@ /vmkit/branches/precise:112509-120199 /vmkit/branches/release_028:115466-116298 +/vmkit/trunk:167712-170949 Modified: vmkit/branches/release_032/lib/j3/Compiler/JavaLLVMCompiler.cpp URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_032/lib/j3/Compiler/JavaLLVMCompiler.cpp?rev=170957&r1=170956&r2=170957&view=diff ============================================================================== --- vmkit/branches/release_032/lib/j3/Compiler/JavaLLVMCompiler.cpp (original) +++ vmkit/branches/release_032/lib/j3/Compiler/JavaLLVMCompiler.cpp Fri Dec 21 17:23:48 2012 @@ -61,7 +61,7 @@ // We are jitting. Take the lock. vmkit::VmkitModule::protectIR(); if (func->getLinkage() == GlobalValue::ExternalWeakLinkage) { - JavaJIT jit(this, meth, func, customizeFor); + JavaJIT jit(this, meth, func, LMI->isCustomizable? customizeFor : NULL); if (isNative(meth->access)) { jit.nativeCompile(); vmkit::VmkitModule::runPasses(func, JavaNativeFunctionPasses); @@ -75,11 +75,9 @@ if (!LMI->isCustomizable && jit.isCustomizable) { // It's the first time we parsed the method and we just found // out it can be customized. + // TODO(geoffray): return a customized version to this caller. meth->isCustomizable = true; LMI->isCustomizable = true; - if (customizeFor != NULL) { - LMI->setCustomizedVersion(customizeFor, func); - } } } vmkit::VmkitModule::unprotectIR(); Modified: vmkit/branches/release_032/lib/j3/Compiler/LLVMInfo.cpp URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_032/lib/j3/Compiler/LLVMInfo.cpp?rev=170957&r1=170956&r2=170957&view=diff ============================================================================== --- vmkit/branches/release_032/lib/j3/Compiler/LLVMInfo.cpp (original) +++ vmkit/branches/release_032/lib/j3/Compiler/LLVMInfo.cpp Fri Dec 21 17:23:48 2012 @@ -209,17 +209,6 @@ return result; } -void LLVMMethodInfo::setCustomizedVersion(Class* cl, llvm::Function* F) { - assert(customizedVersions.size() == 0); - vmkit::ThreadAllocator allocator; - if (Compiler->emitFunctionName()) { - char* buf = GetMethodName(allocator, methodDef, cl); - F->setName(buf); - } - methodFunction = NULL; - customizedVersions[cl] = F; -} - FunctionType* LLVMMethodInfo::getFunctionType() { if (!functionType) { Signdef* sign = methodDef->getSignature(); Modified: vmkit/branches/release_032/lib/j3/VMCore/JavaThread.h URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_032/lib/j3/VMCore/JavaThread.h?rev=170957&r1=170956&r2=170957&view=diff ============================================================================== --- vmkit/branches/release_032/lib/j3/VMCore/JavaThread.h (original) +++ vmkit/branches/release_032/lib/j3/VMCore/JavaThread.h Fri Dec 21 17:23:48 2012 @@ -156,8 +156,7 @@ /// throwFromJNI - Throw an exception after executing JNI code. /// void throwFromJNI(word_t SP) { - endKnownFrame(); - enterUncooperativeCode(SP); + // Nothing to do. The RETURN_FROM_JNI will take care of it. } /// throwFromNative - Throw an exception after executing Native code. Modified: vmkit/branches/release_032/lib/j3/VMCore/Jni.cpp URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_032/lib/j3/VMCore/Jni.cpp?rev=170957&r1=170956&r2=170957&view=diff ============================================================================== --- vmkit/branches/release_032/lib/j3/VMCore/Jni.cpp (original) +++ vmkit/branches/release_032/lib/j3/VMCore/Jni.cpp Fri Dec 21 17:23:48 2012 @@ -459,7 +459,7 @@ END_JNI_EXCEPTION - return JNI_FALSE; + RETURN_FROM_JNI(0); } From nicolas.geoffray at gmail.com Fri Dec 21 15:24:52 2012 From: nicolas.geoffray at gmail.com (Nicolas Geoffray) Date: Fri, 21 Dec 2012 23:24:52 -0000 Subject: [vmkit-commits] [vmkit] r170958 - /vmkit/branches/release_032/autoconf/configure.ac Message-ID: <20121221232452.696702A6C065@llvm.org> Author: geoffray Date: Fri Dec 21 17:24:51 2012 New Revision: 170958 URL: http://llvm.org/viewvc/llvm-project?rev=170958&view=rev Log: Version 0.32. Modified: vmkit/branches/release_032/autoconf/configure.ac Modified: vmkit/branches/release_032/autoconf/configure.ac URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_032/autoconf/configure.ac?rev=170958&r1=170957&r2=170958&view=diff ============================================================================== --- vmkit/branches/release_032/autoconf/configure.ac (original) +++ vmkit/branches/release_032/autoconf/configure.ac Fri Dec 21 17:24:51 2012 @@ -31,7 +31,7 @@ dnl===-----------------------------------------------------------------------=== dnl Initialize autoconf and define the package name, version number and dnl email address for reporting bugs. -AC_INIT([vmkit],[0.32svn],[nicolas.geoffray at gmail.com]) +AC_INIT([vmkit],[0.32],[nicolas.geoffray at gmail.com]) dnl Provide a copyright substitution and ensure the copyright notice is included dnl in the output of --version option of the generated configure script. From nicolas.geoffray at gmail.com Fri Dec 21 15:26:09 2012 From: nicolas.geoffray at gmail.com (Nicolas Geoffray) Date: Fri, 21 Dec 2012 23:26:09 -0000 Subject: [vmkit-commits] [vmkit] r170959 - /vmkit/branches/release_032/configure Message-ID: <20121221232609.B0E0F2A6C065@llvm.org> Author: geoffray Date: Fri Dec 21 17:26:09 2012 New Revision: 170959 URL: http://llvm.org/viewvc/llvm-project?rev=170959&view=rev Log: Regenerate. Modified: vmkit/branches/release_032/configure Modified: vmkit/branches/release_032/configure URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_032/configure?rev=170959&r1=170958&r2=170959&view=diff ============================================================================== --- vmkit/branches/release_032/configure (original) +++ vmkit/branches/release_032/configure Fri Dec 21 17:26:09 2012 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for vmkit 0.32svn. +# Generated by GNU Autoconf 2.68 for vmkit 0.32. # # Report bugs to . # @@ -562,8 +562,8 @@ # Identity of this package. PACKAGE_NAME='vmkit' PACKAGE_TARNAME='vmkit' -PACKAGE_VERSION='0.32svn' -PACKAGE_STRING='vmkit 0.32svn' +PACKAGE_VERSION='0.32' +PACKAGE_STRING='vmkit 0.32' PACKAGE_BUGREPORT='nicolas.geoffray at gmail.com' PACKAGE_URL='' @@ -1269,7 +1269,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures vmkit 0.32svn to adapt to many kinds of systems. +\`configure' configures vmkit 0.32 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1335,7 +1335,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vmkit 0.32svn:";; + short | recursive ) echo "Configuration of vmkit 0.32:";; esac cat <<\_ACEOF @@ -1435,7 +1435,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vmkit configure 0.32svn +vmkit configure 0.32 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1898,7 +1898,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by vmkit $as_me 0.32svn, which was +It was created by vmkit $as_me 0.32, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -6323,7 +6323,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vmkit $as_me 0.32svn, which was +This file was extended by vmkit $as_me 0.32, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6389,7 +6389,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -vmkit config.status 0.32svn +vmkit config.status 0.32 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" From nicolas.geoffray at gmail.com Fri Dec 21 15:47:13 2012 From: nicolas.geoffray at gmail.com (Nicolas Geoffray) Date: Fri, 21 Dec 2012 23:47:13 -0000 Subject: [vmkit-commits] [vmkit] r170960 - in /vmkit/branches/release_032: Makefile.common.in www/releases/vmkit-0.32.tar.bz2 Message-ID: <20121221234713.C923D2A6C065@llvm.org> Author: geoffray Date: Fri Dec 21 17:47:13 2012 New Revision: 170960 URL: http://llvm.org/viewvc/llvm-project?rev=170960&view=rev Log: Add release 0.32 tarball. Added: vmkit/branches/release_032/www/releases/vmkit-0.32.tar.bz2 (with props) Modified: vmkit/branches/release_032/Makefile.common.in Modified: vmkit/branches/release_032/Makefile.common.in URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_032/Makefile.common.in?rev=170960&r1=170959&r2=170960&view=diff ============================================================================== --- vmkit/branches/release_032/Makefile.common.in (original) +++ vmkit/branches/release_032/Makefile.common.in Fri Dec 21 17:47:13 2012 @@ -19,7 +19,7 @@ # Include LLVM's Master Makefile. include $(LLVM_OBJ_ROOT)/Makefile.common -CXX.Flags += @GC_FLAGS@ -fno-exceptions -Wno-variadic-macros -fno-omit-frame-pointer -fno-strict-aliasing -Wno-deprecated -ansi -fno-rtti +CXX.Flags += @GC_FLAGS@ -fno-exceptions -Wno-variadic-macros -fno-omit-frame-pointer -fno-strict-aliasing -Wno-deprecated -ansi -fno-rtti -Wno-unused-private-field # GNU Classpath flags CLASSPATH_FLAGS = Added: vmkit/branches/release_032/www/releases/vmkit-0.32.tar.bz2 URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/release_032/www/releases/vmkit-0.32.tar.bz2?rev=170960&view=auto ============================================================================== Binary file - no diff available. Propchange: vmkit/branches/release_032/www/releases/vmkit-0.32.tar.bz2 ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream From nicolas.geoffray at gmail.com Fri Dec 21 15:49:35 2012 From: nicolas.geoffray at gmail.com (Nicolas Geoffray) Date: Fri, 21 Dec 2012 23:49:35 -0000 Subject: [vmkit-commits] [vmkit] r170962 - /vmkit/trunk/www/releases/index.html Message-ID: <20121221234935.1509A2A6C065@llvm.org> Author: geoffray Date: Fri Dec 21 17:49:34 2012 New Revision: 170962 URL: http://llvm.org/viewvc/llvm-project?rev=170962&view=rev Log: Add link to release 0.32. Modified: vmkit/trunk/www/releases/index.html Modified: vmkit/trunk/www/releases/index.html URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/www/releases/index.html?rev=170962&r1=170961&r2=170962&view=diff ============================================================================== --- vmkit/trunk/www/releases/index.html (original) +++ vmkit/trunk/www/releases/index.html Fri Dec 21 17:49:34 2012 @@ -27,6 +27,9 @@