[vmkit-commits] [vmkit] r199673 - Apply the lowring passes during compilation (they currently don't do anything).

[Gael Thomas]

Author: gthomas
Date: Mon Jan 20 10:50:37 2014
New Revision: 199673

URL: http://llvm.org/viewvc/llvm-project?rev=199673&view=rev
Log:
Apply the lowring passes during compilation (they currently don't do anything).

Modified:
    vmkit/branches/mcjit/lib/mmtk/Makefile
    vmkit/branches/mcjit/lib/mmtk/magic/lower-java-runtime.cc
    vmkit/branches/mcjit/lib/mmtk/magic/lower-magic.cc

Modified: vmkit/branches/mcjit/lib/mmtk/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/mmtk/Makefile?rev=199673&r1=199672&r2=199673&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/mmtk/Makefile (original)
+++ vmkit/branches/mcjit/lib/mmtk/Makefile Mon Jan 20 10:50:37 2014
@@ -5,7 +5,7 @@
 
 LEVEL := ../..
 
-PARALLEL_DIRS:=magic
+DIRS:=magic
 
 BASE_OBJ_FILES=mmtk-lowered
 MODULE=mmtk
@@ -16,9 +16,9 @@ MMTK_JAR=$(MMTK_PATH)/mmtk/mmtk.jar
 LOWER=$(LIB_DIR)/mmtk-pass$(SHLIBEXT)
 J3=$(BIN_DIR)/j3
 
-$(BUILD_DIR)/mmtk-lowered.bc: $(BUILD_DIR)/mmtk-bc.bc $(LOWER)
-	$(Echo) "Lowering '$(notdir $<)'"
-	$(Verb) cp $< $@
+$(BUILD_DIR)/mmtk-lowered.bc: $(BUILD_DIR)/mmtk-bc.bc $(LOWER) 
+	$(Echo) "Lowering magic '$(notdir $<)'"
+	$(Verb) $(LLOPT) -load=$(LOWER) -LowerMagic -LowerJavaRT $(OPTFLAGS) -f $< -o $@
 
 $(BUILD_DIR)/mmtk-bc.bc: $(MMTK_JAR) $(BUILD_DIR)/.dir $(J3) $(SELF)
 	$(Echo) "Compiling '$(notdir $<)'"

Modified: vmkit/branches/mcjit/lib/mmtk/magic/lower-java-runtime.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/mmtk/magic/lower-java-runtime.cc?rev=199673&r1=199672&r2=199673&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/mmtk/magic/lower-java-runtime.cc (original)
+++ vmkit/branches/mcjit/lib/mmtk/magic/lower-java-runtime.cc Mon Jan 20 10:50:37 2014
@@ -7,8 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if 0
-
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Function.h"
 #include "llvm/IR/Instructions.h"
@@ -36,9 +34,16 @@ namespace {
   static RegisterPass<LowerJavaRT> X("LowerJavaRT",
                                      "Remove references to RT");
 
+
 bool LowerJavaRT::runOnModule(Module& M) {
   bool Changed = true;
 
+	fprintf(stderr, "Lowering java runtime in %s\n", M.getModuleIdentifier().data());
+
+  return Changed;
+}
+#if 0
+
   for (Module::iterator I = M.begin(), E = M.end(); I != E;) {
     Function& GV = *I;
     ++I;
@@ -147,9 +152,6 @@ bool LowerJavaRT::runOnModule(Module& M)
   // malloc and barriers.
   M.getTypeByName("JavaObject")->setName("MMTk.JavaObject");
 
-  return Changed;
-}
-
 }
-
 #endif
+}

Modified: vmkit/branches/mcjit/lib/mmtk/magic/lower-magic.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/mmtk/magic/lower-magic.cc?rev=199673&r1=199672&r2=199673&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/mmtk/magic/lower-magic.cc (original)
+++ vmkit/branches/mcjit/lib/mmtk/magic/lower-magic.cc Mon Jan 20 10:50:37 2014
@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if 0
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Function.h"
@@ -22,8 +21,8 @@
 
 #include <cstdio>
 
-#include "vmkit/GC.h"
-#include "vmkit/System.h"
+//#include "vmkit/GC.h"
+//#include "vmkit/System.h"
 
 using namespace llvm;
 
@@ -37,10 +36,19 @@ namespace vmmagic {
     virtual bool runOnFunction(Function &F);
   private:
   };
-  char LowerMagic::ID = 0;
-  static RegisterPass<LowerMagic> X("LowerMagic",
-                                    "Lower magic calls");
-  typedef SmallPtrSet<Instruction*,128> InstSet;
+
+char LowerMagic::ID = 0;
+static RegisterPass<LowerMagic> X("LowerMagic",
+																	"Lower magic calls");
+typedef SmallPtrSet<Instruction*,128> InstSet;
+
+bool LowerMagic::runOnFunction(Function& F) {
+  bool Changed = false;
+	fprintf(stderr, "Lowering magic of %s\n", F.getName().data());
+	return Changed;
+}
+}
+#if 0
 
 static const char* AddressClass = "JnJVM_org_vmmagic_unboxed_Address_";
 static const char* AddressZeroMethod = 0;