[vmkit-commits] [vmkit] r121259 - in /vmkit/branches/multi-vm/tools: Makefile toy-vm/ toy-vm/Main.cpp toy-vm/Makefile

[Gael Thomas]

Author: gthomas
Date: Wed Dec  8 08:59:22 2010
New Revision: 121259

URL: http://llvm.org/viewvc/llvm-project?rev=121259&view=rev
Log:
add a directory for a toy vm

Added:
    vmkit/branches/multi-vm/tools/toy-vm/   (with props)
    vmkit/branches/multi-vm/tools/toy-vm/Main.cpp
    vmkit/branches/multi-vm/tools/toy-vm/Makefile
Modified:
    vmkit/branches/multi-vm/tools/Makefile

Modified: vmkit/branches/multi-vm/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/tools/Makefile?rev=121259&r1=121258&r2=121259&view=diff
==============================================================================
--- vmkit/branches/multi-vm/tools/Makefile (original)
+++ vmkit/branches/multi-vm/tools/Makefile Wed Dec  8 08:59:22 2010
@@ -27,7 +27,7 @@
 endif
 
 ifeq ($(WITH_J3), 1)
-  PARALLEL_DIRS += #toy-vm
+  PARALLEL_DIRS += toy-vm
 endif
 
 include $(LEVEL)/Makefile.common

Propchange: vmkit/branches/multi-vm/tools/toy-vm/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec  8 08:59:22 2010
@@ -0,0 +1,4 @@
+Release
+vmkitoptimized.bc
+toy-vm.s
+toy-vm.bc

Added: vmkit/branches/multi-vm/tools/toy-vm/Main.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/tools/toy-vm/Main.cpp?rev=121259&view=auto
==============================================================================
--- vmkit/branches/multi-vm/tools/toy-vm/Main.cpp (added)
+++ vmkit/branches/multi-vm/tools/toy-vm/Main.cpp Wed Dec  8 08:59:22 2010
@@ -0,0 +1,5 @@
+
+
+int main(int argc, char **argv) {
+	return 0;
+}

Added: vmkit/branches/multi-vm/tools/toy-vm/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/multi-vm/tools/toy-vm/Makefile?rev=121259&view=auto
==============================================================================
--- vmkit/branches/multi-vm/tools/toy-vm/Makefile (added)
+++ vmkit/branches/multi-vm/tools/toy-vm/Makefile Wed Dec  8 08:59:22 2010
@@ -0,0 +1,39 @@
+##===- tools/toy-vm/Makefile --------------------------------*- Makefile -*-===##
+# 
+#                     The vmkit project
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+LEVEL = ../..
+
+include $(LEVEL)/Makefile.config
+
+TOOLNAME = toy-vm
+
+ifeq ($(WITH_LLVM_GCC), 1)
+
+  MODULESNAME = toy-vm
+  USEDMODULES = J3.bc Classpath.bc J3Compiler.bc Allocator.bc CommonThread.bc Mvm.bc MvmCompiler.bc
+
+  ifeq ($(GC_MMTK), 1)
+    USEDMODULES += FinalMMTk.bc InlineMMTk.bc
+  else
+    USEDMODULES += $(GCLIB).bc
+  endif
+
+  BUILT_SOURCES = toy-vm.s
+  SOURCES = toy-vm.s $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cpp))
+
+else
+
+USEDLIBS = J3.a Classpath.a J3.a J3Compiler.a Allocator.a \
+	   Mvm.a MvmCompiler.a $(GCLIB).a Allocator.a CommonThread.a
+
+endif
+
+LINK_COMPONENTS = jit nativecodegen scalaropts instrumentation ipa ipo bitreader asmparser linker
+
+include $(LEVEL)/Makefile.common
+