[vmkit-commits] [vmkit] r199601 - Add the configuration option for the location of mmtk.jar

[Gael Thomas]

Author: gthomas
Date: Sun Jan 19 09:11:01 2014
New Revision: 199601

URL: http://llvm.org/viewvc/llvm-project?rev=199601&view=rev
Log:
Add the configuration option for the location of mmtk.jar

Modified:
    vmkit/branches/mcjit/Makefile.config.in
    vmkit/branches/mcjit/autoconf/configure.ac
    vmkit/branches/mcjit/configure
    vmkit/branches/mcjit/lib/j3/vm/j3.cc
    vmkit/branches/mcjit/lib/j3/vm/j3options.cc

Modified: vmkit/branches/mcjit/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/Makefile.config.in?rev=199601&r1=199600&r2=199601&view=diff
==============================================================================
--- vmkit/branches/mcjit/Makefile.config.in (original)
+++ vmkit/branches/mcjit/Makefile.config.in Sun Jan 19 09:11:01 2014
@@ -31,4 +31,6 @@ LLVM_LDFLAGS=@LLVM_LDFLAGS@
 
 OPENJDK_HOME=@jdkhome@
 
+MMTK_PATH=@mmtkpath@
+
 OS=@OS@
\ No newline at end of file

Modified: vmkit/branches/mcjit/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/autoconf/configure.ac?rev=199601&r1=199600&r2=199601&view=diff
==============================================================================
--- vmkit/branches/mcjit/autoconf/configure.ac (original)
+++ vmkit/branches/mcjit/autoconf/configure.ac Sun Jan 19 09:11:01 2014
@@ -207,7 +207,7 @@ dnl ************************************
 
 AC_ARG_WITH(jdkhome,
        [AS_HELP_STRING(--with-jdkhome,
-           [Build J3 with OpenJDK JRE install (default is $JAVA_HOME or /usr/lib/java)])],
+           [JRE home (default is $JAVA_HOME)])],
        [[jdkhome=$with_jdkhome]],
        [[jdkhome=""]]
 )
@@ -222,6 +222,23 @@ fi
 
 AC_SUBST([jdkhome])
 
+dnl **************************************************************************
+dnl MMTk
+dnl **************************************************************************
+
+AC_ARG_WITH(mmtkpath,
+       [AS_HELP_STRING(--with-mmtkpath=path,
+           [MMTk path (use mmtk.jar)])],
+       [[mmtkpath=$with_mmtkpath]],
+       [[mmtkpath="`pwd`/mmtk.jar"]]
+)
+
+if test ! -f "$mmtkpath"; then
+     AC_MSG_ERROR([Cannot find MMTk in '$mmtkpath'])
+fi
+
+AC_SUBST([mmtkpath])
+
 dnl===-----------------------------------------------------------------------===
 dnl===
 dnl=== SECTION 4: Check for programs we need and that they are the right version

Modified: vmkit/branches/mcjit/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/configure?rev=199601&r1=199600&r2=199601&view=diff
==============================================================================
--- vmkit/branches/mcjit/configure (original)
+++ vmkit/branches/mcjit/configure Sun Jan 19 09:11:01 2014
@@ -608,6 +608,7 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+mmtkpath
 jdkhome
 LLVM_LDFLAGS
 LLVM_LIBS
@@ -681,6 +682,7 @@ with_llvm_config_path
 with_llvm_runtime_config_path
 with_clang_path
 with_jdkhome
+with_mmtkpath
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1319,8 +1321,8 @@ Optional Packages:
                           llvm-runtime-config path (use llvm-config-path)
   --with-clang-path=path  clang path (use llvm-config --bindir and then
                           default path)
-  --with-jdkhome          Build J3 with OpenJDK JRE install (default is
-                          $JAVA_HOME or /usr/lib/java)
+  --with-jdkhome          JRE home (default is $JAVA_HOME)
+  --with-mmtkpath=path    MMTk path (use mmtk.jar)
 
 Some influential environment variables:
   CC          C compiler command
@@ -2183,6 +2185,23 @@ if test -z "$jdkhome"; then
 fi
 
 
+
+
+
+# Check whether --with-mmtkpath was given.
+if test "${with_mmtkpath+set}" = set; then :
+  withval=$with_mmtkpath; mmtkpath=$with_mmtkpath
+else
+  mmtkpath="`pwd`/mmtk.jar"
+
+fi
+
+
+if test ! -f "$mmtkpath"; then
+     as_fn_error $? "Cannot find MMTk in '$mmtkpath'" "$LINENO" 5
+fi
+
+
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'

Modified: vmkit/branches/mcjit/lib/j3/vm/j3.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3.cc?rev=199601&r1=199600&r2=199601&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3.cc Sun Jan 19 09:11:01 2014
@@ -169,12 +169,12 @@ void J3::run() {
 #undef defJavaClassPrimitive
 
 	if(options()->debugLifeCycle)
-		fprintf(stderr, "  Bootstraping the system library\n");
+		fprintf(stderr, "  Bootstrap the system library\n");
 
 	J3Lib::bootstrap(this);
 
 	if(options()->debugLifeCycle)
-		fprintf(stderr, "  Launching the application\n");
+		fprintf(stderr, "  Find the application\n");
 
 	//options()->debugExecute = 0;
 
@@ -185,7 +185,8 @@ void J3::run() {
 																						->invokeStatic(1, 1, utfToString("HelloWorld")).valObject)->asClass();
 
 
-	fprintf(stderr, " main class: %s\n", main->name()->cStr());
+	if(options()->debugLifeCycle)
+		fprintf(stderr, "  Launch the application\n");
 
 	main
 		->findMethod(J3Cst::ACC_STATIC, names()->get("main"), initialClassLoader->getSignature(0, names()->get("([Ljava/lang/String;)V")))

Modified: vmkit/branches/mcjit/lib/j3/vm/j3options.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3options.cc?rev=199601&r1=199600&r2=199601&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3options.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3options.cc Sun Jan 19 09:11:01 2014
@@ -15,15 +15,15 @@ J3Options::J3Options() {
 
 	debugEnterIndent = 1;
 
-	debugExecute = 0;
+	debugExecute = 1;
 	debugLoad = 0;
 	debugResolve = 0;
 	debugIniting = 0;
 	debugTranslate = 0;
 	debugLinking = 0;
-	debugLifeCycle = 1;
+	debugLifeCycle = 0;
 
-	genDebugExecute = 0;//debugExecute ? 1 : 0;
+	genDebugExecute = 1;//debugExecute ? 1 : 0;
 
 	stackSize = 0x80*0x1000;
 }