[vmkit-commits] [vmkit] r86246 - in /vmkit/trunk: lib/JnJVM/LLVMRuntime/runtime-mmtk-thread.ll lib/Mvm/MMTk/MutatorThread.h mmtk/java/src/org/j3/config/Selected.java

[Nicolas Geoffray]

Author: geoffray
Date: Fri Nov  6 03:57:44 2009
New Revision: 86246

URL: http://llvm.org/viewvc/llvm-project?rev=86246&view=rev
Log:
There is currenty only one CollectorContext.


Modified:
    vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-mmtk-thread.ll
    vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h
    vmkit/trunk/mmtk/java/src/org/j3/config/Selected.java

Modified: vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-mmtk-thread.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-mmtk-thread.ll?rev=86246&r1=86245&r2=86246&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-mmtk-thread.ll (original)
+++ vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-mmtk-thread.ll Fri Nov  6 03:57:44 2009
@@ -18,5 +18,4 @@
 ;;; field 14: MutatorContext
 ;;; field 15: CollectorContext
 %MutatorThread = type { %VT*, %JavaThread*, %JavaThread*, i8*, i8*, i8*, i1, i1,
-                        i1, i8*, i8*, i8*, %Vector, %BumpPtrAllocator, i8*, i8*,
-                        i8* }
+                        i1, i8*, i8*, i8*, %Vector, %BumpPtrAllocator, i8*, i8*}

Modified: vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h?rev=86246&r1=86245&r2=86246&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h (original)
+++ vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h Fri Nov  6 03:57:44 2009
@@ -20,7 +20,6 @@
 public:
   mvm::BumpPtrAllocator Allocator;
   uintptr_t MutatorContext;
-  uintptr_t CollectorContext;
   
   /// realRoutine - The function to invoke when the thread starts.
   ///
@@ -47,10 +46,6 @@
     ((VirtualTable**)th->MutatorContext)[0] = MutatorVT;
     MutatorInit(th->MutatorContext);
     MutatorCallInit(th->MutatorContext, (int32_t)_th->getThreadID());
-    th->CollectorContext = 
-      (uintptr_t)th->Allocator.Allocate(MMTkCollectorSize, "Collector");
-    ((VirtualTable**)th->CollectorContext)[0] = CollectorVT;
-    CollectorInit(th->CollectorContext);
     th->realRoutine(_th);
     MutatorCallDeinit(th->MutatorContext);
   }

Modified: vmkit/trunk/mmtk/java/src/org/j3/config/Selected.java
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/java/src/org/j3/config/Selected.java?rev=86246&r1=86245&r2=86246&view=diff

==============================================================================
--- vmkit/trunk/mmtk/java/src/org/j3/config/Selected.java (original)
+++ vmkit/trunk/mmtk/java/src/org/j3/config/Selected.java Fri Nov  6 03:57:44 2009
@@ -44,14 +44,14 @@
 
     public Collector() {}
     @Inline
-    public native static Collector get();
+    public static Collector get() {
+      return bootstrapCollector;
+    }
   }
 
   @Uninterruptible
   public static class Mutator extends org.mmtk.plan.marksweep.MSMutator
   {
-    private static final Mutator bootstrapThread = new Mutator();
-
     public Mutator() {}
 
     @Inline