[vmkit-commits] [vmkit] r91565 - in /vmkit/trunk: lib/Mvm/Compiler/JIT.cpp mmtk/magic/LowerJavaRT.cpp mmtk/mmtk-alloc/Makefile mmtk/mmtk-fake/Makefile mmtk/mmtk-j3/Makefile tools/vmkit/Makefile

[Nicolas Geoffray]

Author: geoffray
Date: Wed Dec 16 14:47:08 2009
New Revision: 91565

URL: http://llvm.org/viewvc/llvm-project?rev=91565&view=rev
Log:
Forgot to update these files from previous commit.


Modified:
    vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
    vmkit/trunk/mmtk/magic/LowerJavaRT.cpp
    vmkit/trunk/mmtk/mmtk-alloc/Makefile
    vmkit/trunk/mmtk/mmtk-fake/Makefile
    vmkit/trunk/mmtk/mmtk-j3/Makefile
    vmkit/trunk/tools/vmkit/Makefile

Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=91565&r1=91564&r2=91565&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Wed Dec 16 14:47:08 2009
@@ -224,7 +224,7 @@
     assert(F && "Could not find boot from HeapGrowthManager");
     BootHeapType BootHeap = (BootHeapType)
       (uintptr_t)executionEngine->getPointerToFunction(F);
-    BootHeap(50 * 1024 * 1024, 100 * 1024 * 1024);
+    BootHeap(128 * 1024 * 1024, 1024 * 1024 * 1024);
     
     GV = globalModule->getGlobalVariable("org_j3_config_Selected_4Plan_static", false);
     assert(GV && "No global plan.");

Modified: vmkit/trunk/mmtk/magic/LowerJavaRT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/magic/LowerJavaRT.cpp?rev=91565&r1=91564&r2=91565&view=diff

==============================================================================
--- vmkit/trunk/mmtk/magic/LowerJavaRT.cpp (original)
+++ vmkit/trunk/mmtk/magic/LowerJavaRT.cpp Wed Dec 16 14:47:08 2009
@@ -18,7 +18,7 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include "jnjvm/JnjvmModule.h"
+#include "j3/JnjvmModule.h"
 
 
 using namespace llvm;

Modified: vmkit/trunk/mmtk/mmtk-alloc/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Makefile?rev=91565&r1=91564&r2=91565&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Makefile (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Makefile Wed Dec 16 14:47:08 2009
@@ -20,7 +20,7 @@
 LOADABLE_MODULE = 1
 USEDLIBS =
 
-CXX.Flags += -I$(PROJ_OBJ_DIR)/../../lib/JnJVM/VMCore
+CXX.Flags += -I$(PROJ_OBJ_DIR)/../../lib/J3/VMCore
 
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/mmtk/mmtk-fake/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-fake/Makefile?rev=91565&r1=91564&r2=91565&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-fake/Makefile (original)
+++ vmkit/trunk/mmtk/mmtk-fake/Makefile Wed Dec 16 14:47:08 2009
@@ -15,7 +15,7 @@
 LOADABLE_MODULE = 1
 USEDLIBS =
 
-CXX.Flags += -I$(PROJ_OBJ_DIR)/../../lib/JnJVM/VMCore
+CXX.Flags += -I$(PROJ_OBJ_DIR)/../../lib/J3/VMCore
 
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/mmtk/mmtk-j3/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Makefile?rev=91565&r1=91564&r2=91565&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Makefile (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Makefile Wed Dec 16 14:47:08 2009
@@ -20,7 +20,7 @@
 LOADABLE_MODULE = 1
 USEDLIBS =
 
-CXX.Flags += -I$(PROJ_OBJ_DIR)/../../lib/JnJVM/VMCore
+CXX.Flags += -I$(PROJ_OBJ_DIR)/../../lib/J3/VMCore
 
 include $(LEVEL)/Makefile.common
 

Modified: vmkit/trunk/tools/vmkit/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmkit/Makefile?rev=91565&r1=91564&r2=91565&view=diff

==============================================================================
--- vmkit/trunk/tools/vmkit/Makefile (original)
+++ vmkit/trunk/tools/vmkit/Makefile Wed Dec 16 14:47:08 2009
@@ -18,7 +18,7 @@
   MODULESNAME = vmkit
 
   ifeq ($(WITH_J3), 1)
-    USEDMODULES += J3.bc Classpath.bc JnjvmCompiler.bc
+    USEDMODULES += J3.bc Classpath.bc J3Compiler.bc
   endif
 
   ifeq ($(ISOLATE_SHARING_BUILD), 1)