From nicolas.geoffray at lip6.fr  Wed May 23 13:35:18 2012
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Wed, 23 May 2012 20:35:18 -0000
Subject: [vmkit-commits] [vmkit] r157343 - /vmkit/trunk/Makefile.rules
Message-ID: <20120523203518.9DEE62A6C065@llvm.org>

Author: geoffray
Date: Wed May 23 15:35:18 2012
New Revision: 157343

URL: http://llvm.org/viewvc/llvm-project?rev=157343&view=rev
Log:
llvm-ld does not exist anymore, use llvm-link instead.


Modified:
    vmkit/trunk/Makefile.rules

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=157343&r1=157342&r2=157343&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Wed May 23 15:35:18 2012
@@ -73,7 +73,7 @@
 	$(Verb) $(LOPT) -load=$(LibDir)/JITGCPass$(SHLIBEXT) -std-compile-opts -JITGCPass -f $(LibDir)/MMTKAlloc.bc -o $(LibDir)/MMTKAlloc.bc
 	$(Verb) $(VMJC) -std-compile-opts -load=$(LibDir)/MMTKRuntime$(SHLIBEXT) -load=$(LibDir)/MMTKMagic$(SHLIBEXT) -LowerMagic $(PROJ_OBJ_ROOT)/mmtk/java/$(JARNAME).jar -disable-exceptions -disable-cooperativegc -with-clinit=org/mmtk/vm/VM,org/mmtk/utility/*,org/mmtk/policy/*,org/j3/config/* -Dmmtk.hostjvm=org.j3.mmtk.Factory -o $(JARNAME).bc -Dmmtk.properties=$(PROJ_SRC_ROOT)/mmtk/java/vmkit.properties -disable-stubs -assume-compiled
 	$(Verb) $(LOPT) -load=$(LibDir)/MMTKMagic$(SHLIBEXT) -std-compile-opts -LowerJavaRT -f $(JARNAME).bc -o $(JARNAME)-optimized.bc
-	$(Verb) $(LLVMLD) -r -o $(LibDir)/FinalMMTk.bc $(LibDir)/MMTKAlloc.bc $(JARNAME)-optimized.bc $(LibDir)/MMTKRuntime.bc
+	$(Verb) $(LLVMLINK) -o $(LibDir)/FinalMMTk.bc $(LibDir)/MMTKAlloc.bc $(JARNAME)-optimized.bc $(LibDir)/MMTKRuntime.bc
 	$(Verb) $(LOPT) $(LibDir)/FinalMMTk.bc -load=$(LibDir)/StaticGCPass$(SHLIBEXT) -std-compile-opts -StaticGCPass -o $(LibDir)/FinalMMTk.bc
 	$(Verb) $(MKDIR) $(ObjDir)
 	$(Verb) $(LLC) -disable-fp-elim -disable-cfi -disable-debug-info-print -load=$(LibDir)/StaticGCPrinter$(SHLIBEXT) $(LibDir)/FinalMMTk.bc -o $(ObjDir)/FinalMMTk.s




From nicolas.geoffray at lip6.fr  Wed May 23 13:35:47 2012
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Wed, 23 May 2012 20:35:47 -0000
Subject: [vmkit-commits] [vmkit] r157344 - in /vmkit/trunk/lib/j3/VMCore:
 JavaClass.h JavaRuntimeJIT.cpp
Message-ID: <20120523203547.295702A6C065@llvm.org>

Author: geoffray
Date: Wed May 23 15:35:46 2012
New Revision: 157344

URL: http://llvm.org/viewvc/llvm-project?rev=157344&view=rev
Log:
Remove compilation warnings.


Modified:
    vmkit/trunk/lib/j3/VMCore/JavaClass.h
    vmkit/trunk/lib/j3/VMCore/JavaRuntimeJIT.cpp

Modified: vmkit/trunk/lib/j3/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaClass.h?rev=157344&r1=157343&r2=157344&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaClass.h Wed May 23 15:35:46 2012
@@ -1225,12 +1225,12 @@
     GETINSTANCEFIELD(TYPE, TYPE_NAME)                                       \
     SETINSTANCEFIELD(TYPE, TYPE_NAME)                                       \
 
-  MK_ASSESSORS(float, Float);
-  MK_ASSESSORS(double, Double);
-  MK_ASSESSORS(uint8, Int8);
-  MK_ASSESSORS(uint16, Int16);
-  MK_ASSESSORS(uint32, Int32);
-  MK_ASSESSORS(sint64, Long);
+  MK_ASSESSORS(float, Float)
+  MK_ASSESSORS(double, Double)
+  MK_ASSESSORS(uint8, Int8)
+  MK_ASSESSORS(uint16, Int16)
+  MK_ASSESSORS(uint32, Int32)
+  MK_ASSESSORS(sint64, Long)
 
   JavaObject* getStaticObjectField() {
     assert(classDef->isResolved());

Modified: vmkit/trunk/lib/j3/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/VMCore/JavaRuntimeJIT.cpp?rev=157344&r1=157343&r2=157344&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/j3/VMCore/JavaRuntimeJIT.cpp Wed May 23 15:35:46 2012
@@ -501,7 +501,7 @@
 
 // Does not throw an exception.
 extern "C" void* j3ResolveInterface(JavaObject* obj, JavaMethod* meth, uint32_t index) {
-  word_t result = NULL;
+  word_t result = 0;
   InterfaceMethodTable* IMT = JavaObject::getClass(obj)->virtualVT->IMT;
   if ((IMT->contents[index] & 1) == 0) {
     result = IMT->contents[index];