[vmkit-commits] [vmkit] r199615 - Add a new Makefile to generate the llvm bytecode of mmtk.

[Gael Thomas]

Author: gthomas
Date: Sun Jan 19 15:58:10 2014
New Revision: 199615

URL: http://llvm.org/viewvc/llvm-project?rev=199615&view=rev
Log:
Add a new Makefile to generate the llvm bytecode of mmtk.

Added:
    vmkit/branches/mcjit/lib/mmtk/   (with props)
    vmkit/branches/mcjit/lib/mmtk/Makefile
Modified:
    vmkit/branches/mcjit/Makefile
    vmkit/branches/mcjit/autoconf/configure.ac
    vmkit/branches/mcjit/configure
    vmkit/branches/mcjit/lib/j3/vm/j3.cc
    vmkit/branches/mcjit/lib/j3/vm/j3class.cc
    vmkit/branches/mcjit/lib/j3/vm/j3method.cc

Modified: vmkit/branches/mcjit/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/Makefile?rev=199615&r1=199614&r2=199615&view=diff
==============================================================================
--- vmkit/branches/mcjit/Makefile (original)
+++ vmkit/branches/mcjit/Makefile Sun Jan 19 15:58:10 2014
@@ -5,6 +5,6 @@
 
 LEVEL := .
 
-DIRS := tools/vmkit-extract lib tools
+DIRS := tools/vmkit-extract lib tools/j3 lib/mmtk
 
 include $(LEVEL)/Makefile.rules

Modified: vmkit/branches/mcjit/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/autoconf/configure.ac?rev=199615&r1=199614&r2=199615&view=diff
==============================================================================
--- vmkit/branches/mcjit/autoconf/configure.ac (original)
+++ vmkit/branches/mcjit/autoconf/configure.ac Sun Jan 19 15:58:10 2014
@@ -228,12 +228,12 @@ dnl ************************************
 
 AC_ARG_WITH(mmtkpath,
        [AS_HELP_STRING(--with-mmtkpath=path,
-           [MMTk path (use mmtk.jar)])],
+           [MMTk path (default ../jikesrvm/target)])],
        [[mmtkpath=$with_mmtkpath]],
-       [[mmtkpath="`pwd`/mmtk.jar"]]
+       [[mmtkpath="`pwd`/../jikesrvm/target"]]
 )
 
-if test ! -f "$mmtkpath"; then
+if test ! -f "$mmtkpath/mmtk/mmtk.jar"; then
      AC_MSG_ERROR([Cannot find MMTk in '$mmtkpath'])
 fi
 

Modified: vmkit/branches/mcjit/configure
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/configure?rev=199615&r1=199614&r2=199615&view=diff
==============================================================================
--- vmkit/branches/mcjit/configure (original)
+++ vmkit/branches/mcjit/configure Sun Jan 19 15:58:10 2014
@@ -1322,7 +1322,7 @@ Optional Packages:
   --with-clang-path=path  clang path (use llvm-config --bindir and then
                           default path)
   --with-jdkhome          JRE home (default is $JAVA_HOME)
-  --with-mmtkpath=path    MMTk path (use mmtk.jar)
+  --with-mmtkpath=path    MMTk path (default ../jikesrvm/target)
 
 Some influential environment variables:
   CC          C compiler command
@@ -2192,12 +2192,12 @@ fi
 if test "${with_mmtkpath+set}" = set; then :
   withval=$with_mmtkpath; mmtkpath=$with_mmtkpath
 else
-  mmtkpath="`pwd`/mmtk.jar"
+  mmtkpath="`pwd`/../jikesrvm/target"
 
 fi
 
 
-if test ! -f "$mmtkpath"; then
+if test ! -f "$mmtkpath/mmtk/mmtk.jar"; then
      as_fn_error $? "Cannot find MMTk in '$mmtkpath'" "$LINENO" 5
 fi
 

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=199615&r1=199614&r2=199615&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3.cc Sun Jan 19 15:58:10 2014
@@ -209,8 +209,6 @@ void J3::compileApplication() {
 				buf[name->length()-6] = 0;
 				J3Class* c = loader->getTypeFromQualified(0, buf)->asClass();
 
-				fprintf(stderr, " find: %s\n", c->name()->cStr());
-
 				c->aotCompile();
 			}
 		}

Modified: vmkit/branches/mcjit/lib/j3/vm/j3class.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3class.cc?rev=199615&r1=199614&r2=199615&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3class.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3class.cc Sun Jan 19 15:58:10 2014
@@ -1026,7 +1026,6 @@ void J3ArrayClass::doNativeName() {
 }
 
 J3ObjectHandle* J3ArrayClass::multianewArray(uint32_t dim, uint32_t* args) {
-	fprintf(stderr, "allocating %s %d\n", name()->cStr(), args[0]);
 	J3ObjectHandle* res = J3ObjectHandle::doNewArray(this, args[0]);
 
 	if(dim > 1)

Modified: vmkit/branches/mcjit/lib/j3/vm/j3method.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3method.cc?rev=199615&r1=199614&r2=199615&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3method.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3method.cc Sun Jan 19 15:58:10 2014
@@ -54,7 +54,7 @@ J3Signature::function_t J3Method::cxxCal
 
 void J3Method::aotCompile() {
 	if(!J3Cst::isAbstract(access())) {
-		fprintf(stderr, "compiling: %s::%s%s\n", cl()->name()->cStr(), name()->cStr(), signature()->name()->cStr());
+		//fprintf(stderr, "compiling: %s::%s%s\n", cl()->name()->cStr(), name()->cStr(), signature()->name()->cStr());
 		ensureCompiled(0, 1);
 	}
 }

Propchange: vmkit/branches/mcjit/lib/mmtk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Jan 19 15:58:10 2014
@@ -0,0 +1 @@
+Debug+Asserts

Added: vmkit/branches/mcjit/lib/mmtk/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/mmtk/Makefile?rev=199615&view=auto
==============================================================================
--- vmkit/branches/mcjit/lib/mmtk/Makefile (added)
+++ vmkit/branches/mcjit/lib/mmtk/Makefile Sun Jan 19 15:58:10 2014
@@ -0,0 +1,17 @@
+#===- ./Makefile -------------------------------------------*- Makefile -*--===#
+# 
+#                     The vmkit project
+#===------------------------------------------------------------------------===#
+
+LEVEL := ../..
+
+BASE_OBJ_FILES=mmtk-llvm
+MODULE=mmtk
+
+include $(LEVEL)/Makefile.rules
+
+J3=$(BIN_DIR)/j3
+
+$(BUILD_DIR)/mmtk-llvm.bc: $(BUILD_DIR)/.dir $(J3) $(SELF)
+	$(Echo) "Generating the llvm bytecode of mmtk"
+	$(Verb) $(J3) -Xaot -cp $(MMTK_PATH)/vmmagic-stub/classes/:$(MMTK_PATH)/options/classes/ -jar $(MMTK_PATH)/mmtk/mmtk.jar 
\ No newline at end of file