[vmkit-commits] [vmkit] r83841 - in /vmkit/trunk/mmtk/mmtk-j3: MutatorThread.cpp MutatorThread.h

[Nicolas Geoffray]

Author: geoffray
Date: Mon Oct 12 05:28:20 2009
New Revision: 83841

URL: http://llvm.org/viewvc/llvm-project?rev=83841&view=rev
Log:
Compilation fixes.


Modified:
    vmkit/trunk/mmtk/mmtk-j3/MutatorThread.cpp
    vmkit/trunk/mmtk/mmtk-j3/MutatorThread.h

Modified: vmkit/trunk/mmtk/mmtk-j3/MutatorThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/MutatorThread.cpp?rev=83841&r1=83840&r2=83841&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/MutatorThread.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/MutatorThread.cpp Mon Oct 12 05:28:20 2009
@@ -9,10 +9,20 @@
 
 
 #include "MutatorThread.h"
-#include "mvm/Threads/Thread.h"
+#include "MvmGC.h"
 
 using namespace mvm;
 
+uint32_t MutatorThread::MMTkMutatorSize = 0;
+uint32_t MutatorThread::MMTkCollectorSize = 0;
+
+void (*MutatorThread::MutatorInit)(uintptr_t) = 0;
+void (*MutatorThread::CollectorInit)(uintptr_t) = 0;
+
+gc* (*gc::MMTkGCAllocator)(uintptr_t Mutator, uint32_t sz, uint32_t align,
+                           uint32_t offset, uint32_t allocator,
+                           uint32_t site);
+
 extern "C" void* MMTkMutatorAllocate(uint32_t size, VirtualTable* VT) {
   void* val = MutatorThread::get()->Allocator.Allocate(size, "MMTk");
   ((void**)val)[0] = VT;

Modified: vmkit/trunk/mmtk/mmtk-j3/MutatorThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/MutatorThread.h?rev=83841&r1=83840&r2=83841&view=diff

==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/MutatorThread.h (original)
+++ vmkit/trunk/mmtk/mmtk-j3/MutatorThread.h Mon Oct 12 05:28:20 2009
@@ -16,24 +16,25 @@
 
 namespace mvm {
 
-extern "C" size_t MMTkMutatorSize;
-extern "C" size_t MMTkCollectorSize;
-
-extern "C" void JnJVM_org_j3_config_Selected_00024Mutator__0003Cinit_0003E__(uintptr_t);
-extern "C" void JnJVM_org_j3_config_Selected_00024Collector__0003Cinit_0003E__(uintptr_t);
-
-
 class MutatorThread : public mvm::Thread {
 public:
   mvm::BumpPtrAllocator Allocator;
   uintptr_t MutatorContext;
   uintptr_t CollectorContext;
 
+  static uint32_t MMTkMutatorSize;
+  static uint32_t MMTkCollectorSize;
+
+  static void (*MutatorInit)(uintptr_t);
+  static void (*CollectorInit)(uintptr_t);
+
+
   MutatorThread() {
     MutatorContext = (uintptr_t)Allocator.Allocate(MMTkMutatorSize, "Mutator");
-    JnJVM_org_j3_config_Selected_00024Mutator__0003Cinit_0003E__(MutatorContext);
-    CollectorContext = (uintptr_t)Allocator.Allocate(MMTkCollectorSize, "Collector");
-    JnJVM_org_j3_config_Selected_00024Collector__0003Cinit_0003E__(CollectorContext);
+    MutatorInit(MutatorContext);
+    CollectorContext = 
+      (uintptr_t)Allocator.Allocate(MMTkCollectorSize, "Collector");
+    CollectorInit(CollectorContext);
   }
 
   static MutatorThread* get() {