[vmkit-commits] [vmkit] r145032 - in /vmkit/trunk: lib/J3/ClassLib/ lib/J3/ClassLib/GNUClasspath/ lib/J3/ClassLib/OpenJDK/ lib/J3/Compiler/ lib/J3/VMCore/ lib/Mvm/CommonThread/ lib/Mvm/Compiler/ lib/Mvm/MMTk/ lib/Mvm/Runtime/ mmtk/mmtk-alloc/ mmtk/mmtk-j3/ tools/j3/ tools/precompiler/ tools/vmjc/
Gael Thomas
gael.thomas at lip6.fr
Mon Nov 21 02:28:44 PST 2011
Author: gthomas
Date: Mon Nov 21 04:28:44 2011
New Revision: 145032
URL: http://llvm.org/viewvc/llvm-project?rev=145032&view=rev
Log:
MvmGC.* are now VmkitGC.*
Added:
vmkit/trunk/lib/Mvm/MMTk/VmkitGC.cpp
- copied, changed from r145030, vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp
vmkit/trunk/lib/Mvm/MMTk/VmkitGC.h
- copied, changed from r145031, vmkit/trunk/lib/Mvm/MMTk/MvmGC.h
Removed:
vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp
vmkit/trunk/lib/Mvm/MMTk/MvmGC.h
Modified:
vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathReflect.h
vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMRuntime.inc
vmkit/trunk/lib/J3/ClassLib/OpenJDK/ClasspathReflect.h
vmkit/trunk/lib/J3/ClassLib/VMStaticInstance.h
vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
vmkit/trunk/lib/J3/VMCore/JavaObject.h
vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp
vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp
vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp
vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp
vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp
vmkit/trunk/lib/Mvm/Runtime/Object.cpp
vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
vmkit/trunk/mmtk/mmtk-j3/Collection.cpp
vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h
vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp
vmkit/trunk/tools/j3/Main.cpp
vmkit/trunk/tools/precompiler/Precompiler.cpp
vmkit/trunk/tools/vmjc/vmjc.cpp
Modified: vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathReflect.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathReflect.h?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathReflect.h (original)
+++ vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathReflect.h Mon Nov 21 04:28:44 2011
@@ -10,7 +10,7 @@
#ifndef JNJVM_CLASSPATH_REFLECT_H
#define JNJVM_CLASSPATH_REFLECT_H
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "JavaClass.h"
#include "JavaObject.h"
Modified: vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMRuntime.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMRuntime.inc?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMRuntime.inc (original)
+++ vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ClasspathVMRuntime.inc Mon Nov 21 04:28:44 2011
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "types.h"
Modified: vmkit/trunk/lib/J3/ClassLib/OpenJDK/ClasspathReflect.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/ClassLib/OpenJDK/ClasspathReflect.h?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/OpenJDK/ClasspathReflect.h (original)
+++ vmkit/trunk/lib/J3/ClassLib/OpenJDK/ClasspathReflect.h Mon Nov 21 04:28:44 2011
@@ -10,7 +10,7 @@
#ifndef JNJVM_CLASSPATH_REFLECT_H
#define JNJVM_CLASSPATH_REFLECT_H
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "JavaClass.h"
#include "JavaObject.h"
Modified: vmkit/trunk/lib/J3/ClassLib/VMStaticInstance.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/ClassLib/VMStaticInstance.h?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/ClassLib/VMStaticInstance.h (original)
+++ vmkit/trunk/lib/J3/ClassLib/VMStaticInstance.h Mon Nov 21 04:28:44 2011
@@ -12,7 +12,7 @@
#include "ClasspathReflect.h"
#include "JavaObject.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
namespace j3 {
Modified: vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp Mon Nov 21 04:28:44 2011
@@ -25,7 +25,7 @@
#include "llvm/Target/TargetData.h"
#include <../lib/ExecutionEngine/JIT/JIT.h>
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "vmkit/VirtualMachine.h"
#include "JavaClass.h"
Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.h?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaObject.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaObject.h Mon Nov 21 04:28:44 2011
@@ -14,7 +14,7 @@
#include "vmkit/UTF8.h"
#include "vmkit/Locks.h"
#include "vmkit/Thread.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "types.h"
Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp Mon Nov 21 04:28:44 2011
@@ -19,7 +19,7 @@
#include "debug.h"
#include "vmkit/Thread.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "ClasspathReflect.h"
#include "JavaArray.h"
Modified: vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp Mon Nov 21 04:28:44 2011
@@ -9,7 +9,7 @@
#include <cassert>
#include <signal.h>
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "vmkit/VirtualMachine.h"
#include "vmkit/CollectionRV.h"
Modified: vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp Mon Nov 21 04:28:44 2011
@@ -14,7 +14,7 @@
#include "vmkit/ObjectLocks.h"
#include "vmkit/Thread.h"
#include "vmkit/VirtualMachine.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include <cerrno>
#include <sys/time.h>
#include <pthread.h>
Modified: vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp Mon Nov 21 04:28:44 2011
@@ -13,7 +13,7 @@
#include "vmkit/Locks.h"
#include "vmkit/Thread.h"
#include "vmkit/VirtualMachine.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include <cerrno>
#include <sys/time.h>
#include <pthread.h>
Modified: vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp Mon Nov 21 04:28:44 2011
@@ -9,7 +9,7 @@
#include "debug.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "vmkit/MethodInfo.h"
#include "vmkit/VirtualMachine.h"
#include "vmkit/Cond.h"
Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Mon Nov 21 04:28:44 2011
@@ -44,7 +44,7 @@
#include "vmkit/VirtualMachine.h"
#include "vmkit/GC.h"
#include "MutatorThread.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include <dlfcn.h>
#include <sys/mman.h>
Removed: vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp?rev=145031&view=auto
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp (original)
+++ vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp (removed)
@@ -1,155 +0,0 @@
-//===----------- MvmGC.cpp - Garbage Collection Interface -----------------===//
-//
-// The VMKit project
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "MvmGC.h"
-#include "MutatorThread.h"
-#include "vmkit/VirtualMachine.h"
-
-#include <set>
-
-using namespace mvm;
-
-static mvm::SpinLock lock;
-std::set<gc*> __InternalSet__;
-int Collector::verbose = 0;
-
-extern "C" void* gcmalloc(uint32_t sz, void* _VT) {
- gc* res = 0;
- VirtualTable* VT = (VirtualTable*)_VT;
- sz = llvm::RoundUpToAlignment(sz, sizeof(void*));
- res = (gc*)malloc(sz);
- memset((void*)res, 0, sz);
-
- lock.acquire();
- __InternalSet__.insert(res);
- lock.release();
-
- res->setVirtualTable(VT);
- return res;
-}
-
-extern "C" void* gcmallocUnresolved(uint32_t sz, VirtualTable* VT) {
- gc* res = (gc*)gcmalloc(sz, VT);
- if (VT->hasDestructor())
- mvm::Thread::get()->MyVM->addFinalizationCandidate(res);
- return res;
-}
-
-extern "C" void addFinalizationCandidate(gc* obj) {
- mvm::Thread::get()->MyVM->addFinalizationCandidate(obj);
-}
-
-extern "C" void* AllocateMagicArray(int32_t sz, void* length) {
- gc* res = (gc*)malloc(sz);
- memset((void*)res, 0, sz);
- ((void**)res)[0] = length;
- return res;
-}
-
-void* Collector::begOf(gc* obj) {
- lock.acquire();
- std::set<gc*>::iterator I = __InternalSet__.find(obj);
- std::set<gc*>::iterator E = __InternalSet__.end();
- lock.release();
-
- if (I != E) return obj;
- return 0;
-}
-
-void MutatorThread::init(Thread* _th) {
- MutatorThread* th = (MutatorThread*)_th;
- th->realRoutine(_th);
-}
-
-bool Collector::isLive(gc* ptr, word_t closure) {
- abort();
- return false;
-}
-
-void Collector::scanObject(void** ptr, word_t closure) {
- abort();
-}
-
-void Collector::markAndTrace(void* source, void* ptr, word_t closure) {
- abort();
-}
-
-void Collector::markAndTraceRoot(void* ptr, word_t closure) {
- abort();
-}
-
-gc* Collector::retainForFinalize(gc* val, word_t closure) {
- abort();
- return NULL;
-}
-
-gc* Collector::retainReferent(gc* val, word_t closure) {
- abort();
- return NULL;
-}
-
-gc* Collector::getForwardedFinalizable(gc* val, word_t closure) {
- abort();
- return NULL;
-}
-
-gc* Collector::getForwardedReference(gc* val, word_t closure) {
- abort();
- return NULL;
-}
-
-gc* Collector::getForwardedReferent(gc* val, word_t closure) {
- abort();
- return NULL;
-}
-
-extern "C" void arrayWriteBarrier(void* ref, void** ptr, void* value) {
- *ptr = value;
-}
-
-extern "C" void fieldWriteBarrier(void* ref, void** ptr, void* value) {
- *ptr = value;
-}
-
-extern "C" void nonHeapWriteBarrier(void** ptr, void* value) {
- *ptr = value;
-}
-
-
-void Collector::objectReferenceWriteBarrier(gc* ref, gc** slot, gc* value) {
- *slot = value;
-}
-
-void Collector::objectReferenceArrayWriteBarrier(gc* ref, gc** slot, gc* value) {
- *slot = value;
-}
-
-void Collector::objectReferenceNonHeapWriteBarrier(gc** slot, gc* value) {
- *slot = value;
-}
-
-bool Collector::objectReferenceTryCASBarrier(gc*ref, gc** slot, gc* old, gc* value) {
- gc* res = __sync_val_compare_and_swap(slot, old, value);
- return (old == res);
-}
-
-void Collector::collect() {
- // Do nothing.
-}
-
-void Collector::initialise(int argc, char** argv) {
-}
-
-bool Collector::needsWriteBarrier() {
- return false;
-}
-
-bool Collector::needsNonHeapWriteBarrier() {
- return false;
-}
Removed: vmkit/trunk/lib/Mvm/MMTk/MvmGC.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/MvmGC.h?rev=145031&view=auto
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MvmGC.h (original)
+++ vmkit/trunk/lib/Mvm/MMTk/MvmGC.h (removed)
@@ -1,123 +0,0 @@
-//===----------- MvmGC.h - Garbage Collection Interface -------------------===//
-//
-// The VMKit project
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-
-#ifndef VMKIT_MMTK_GC_H
-#define VMKIT_MMTK_GC_H
-
-#include "vmkit/GC.h"
-#include <cstdlib>
-
-extern "C" void EmptyDestructor();
-
-class VirtualTable {
- public:
- word_t destructor;
- word_t operatorDelete;
- word_t tracer;
- word_t specializedTracers[1];
-
- static uint32_t numberOfBaseFunctions() {
- return 4;
- }
-
- static uint32_t numberOfSpecializedTracers() {
- return 1;
- }
-
- word_t* getFunctions() {
- return &destructor;
- }
-
- VirtualTable(word_t d, word_t o, word_t t) {
- destructor = d;
- operatorDelete = o;
- tracer = t;
- }
-
- VirtualTable() {
- destructor = reinterpret_cast<word_t>(EmptyDestructor);
- }
-
- bool hasDestructor() {
- return destructor != reinterpret_cast<word_t>(EmptyDestructor);
- }
-
- static void emptyTracer(void*) {}
-};
-
-extern "C" void* gcmallocUnresolved(uint32_t sz, VirtualTable* VT);
-extern "C" void* gcmalloc(uint32_t sz, void* VT);
-
-class gc : public gcRoot {
-public:
-
- size_t objectSize() const {
- abort();
- return 0;
- }
-
- void* operator new(size_t sz, VirtualTable *VT) {
- return gcmallocUnresolved(sz, VT);
- }
-};
-
-extern "C" void arrayWriteBarrier(void* ref, void** ptr, void* value);
-extern "C" void fieldWriteBarrier(void* ref, void** ptr, void* value);
-extern "C" void nonHeapWriteBarrier(void** ptr, void* value);
-
-namespace mvm {
-
-class Collector {
-public:
- static int verbose;
-
- static bool isLive(gc* ptr, word_t closure) __attribute__ ((always_inline));
- static void scanObject(void** ptr, word_t closure) __attribute__ ((always_inline));
- static void markAndTrace(void* source, void* ptr, word_t closure) __attribute__ ((always_inline));
- static void markAndTraceRoot(void* ptr, word_t closure) __attribute__ ((always_inline));
- static gc* retainForFinalize(gc* val, word_t closure) __attribute__ ((always_inline));
- static gc* retainReferent(gc* val, word_t closure) __attribute__ ((always_inline));
- static gc* getForwardedFinalizable(gc* val, word_t closure) __attribute__ ((always_inline));
- static gc* getForwardedReference(gc* val, word_t closure) __attribute__ ((always_inline));
- static gc* getForwardedReferent(gc* val, word_t closure) __attribute__ ((always_inline));
- static void objectReferenceWriteBarrier(gc* ref, gc** slot, gc* value) __attribute__ ((always_inline));
- static void objectReferenceArrayWriteBarrier(gc* ref, gc** slot, gc* value) __attribute__ ((always_inline));
- static void objectReferenceNonHeapWriteBarrier(gc** slot, gc* value) __attribute__ ((always_inline));
- static bool objectReferenceTryCASBarrier(gc* ref, gc** slot, gc* old, gc* value) __attribute__ ((always_inline));
- static bool needsWriteBarrier() __attribute__ ((always_inline));
- static bool needsNonHeapWriteBarrier() __attribute__ ((always_inline));
-
- static void collect();
-
- static void initialise(int argc, char** argv);
-
- static int getMaxMemory() {
- return 0;
- }
-
- static int getFreeMemory() {
- return 0;
- }
-
- static int getTotalMemory() {
- return 0;
- }
-
- void setMaxMemory(size_t sz){
- }
-
- void setMinMemory(size_t sz){
- }
-
- static void* begOf(gc*);
-};
-
-}
-#endif
Copied: vmkit/trunk/lib/Mvm/MMTk/VmkitGC.cpp (from r145030, vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/VmkitGC.cpp?p2=vmkit/trunk/lib/Mvm/MMTk/VmkitGC.cpp&p1=vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp&r1=145030&r2=145032&rev=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp (original)
+++ vmkit/trunk/lib/Mvm/MMTk/VmkitGC.cpp Mon Nov 21 04:28:44 2011
@@ -1,4 +1,4 @@
-//===----------- MvmGC.cpp - Garbage Collection Interface -----------------===//
+//===----------- VmkitGC.cpp - Garbage Collection Interface -----------------===//
//
// The VMKit project
//
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "MutatorThread.h"
#include "vmkit/VirtualMachine.h"
Copied: vmkit/trunk/lib/Mvm/MMTk/VmkitGC.h (from r145031, vmkit/trunk/lib/Mvm/MMTk/MvmGC.h)
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/VmkitGC.h?p2=vmkit/trunk/lib/Mvm/MMTk/VmkitGC.h&p1=vmkit/trunk/lib/Mvm/MMTk/MvmGC.h&r1=145031&r2=145032&rev=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MvmGC.h (original)
+++ vmkit/trunk/lib/Mvm/MMTk/VmkitGC.h Mon Nov 21 04:28:44 2011
@@ -1,4 +1,4 @@
-//===----------- MvmGC.h - Garbage Collection Interface -------------------===//
+//===----------- VmkitGC.h - Garbage Collection Interface -------------------===//
//
// The VMKit project
//
Modified: vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp Mon Nov 21 04:28:44 2011
@@ -13,7 +13,7 @@
#include "vmkit/Allocator.h"
#include "vmkit/MethodInfo.h"
#include "vmkit/VirtualMachine.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include <dlfcn.h>
Modified: vmkit/trunk/lib/Mvm/Runtime/Object.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/Object.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/Object.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/Object.cpp Mon Nov 21 04:28:44 2011
@@ -10,7 +10,7 @@
#include <cstdio>
#include <cstdlib>
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "vmkit/VirtualMachine.h"
using namespace mvm;
Modified: vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp Mon Nov 21 04:28:44 2011
@@ -8,7 +8,7 @@
//===----------------------------------------------------------------------===//
#include "MutatorThread.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "../mmtk-j3/MMTkObject.h"
#include "vmkit/VirtualMachine.h"
Modified: vmkit/trunk/mmtk/mmtk-j3/Collection.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Collection.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Collection.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Collection.cpp Mon Nov 21 04:28:44 2011
@@ -10,7 +10,7 @@
#include "debug.h"
#include "vmkit/VirtualMachine.h"
#include "MMTkObject.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
namespace mmtk {
Modified: vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h (original)
+++ vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h Mon Nov 21 04:28:44 2011
@@ -12,7 +12,7 @@
#include <stdint.h>
#include "MutatorThread.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
namespace mmtk {
Modified: vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp Mon Nov 21 04:28:44 2011
@@ -10,7 +10,7 @@
#include "debug.h"
#include "vmkit/VirtualMachine.h"
#include "MMTkObject.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
namespace mmtk {
Modified: vmkit/trunk/tools/j3/Main.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/j3/Main.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/tools/j3/Main.cpp (original)
+++ vmkit/trunk/tools/j3/Main.cpp Mon Nov 21 04:28:44 2011
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "vmkit/JIT.h"
#include "vmkit/MethodInfo.h"
#include "vmkit/VirtualMachine.h"
Modified: vmkit/trunk/tools/precompiler/Precompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/precompiler/Precompiler.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/tools/precompiler/Precompiler.cpp (original)
+++ vmkit/trunk/tools/precompiler/Precompiler.cpp Mon Nov 21 04:28:44 2011
@@ -15,7 +15,7 @@
#include "llvm/Bitcode/ReaderWriter.h"
#include "llvm/Support/Signals.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "vmkit/JIT.h"
#include "vmkit/MethodInfo.h"
#include "vmkit/VirtualMachine.h"
Modified: vmkit/trunk/tools/vmjc/vmjc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/vmjc/vmjc.cpp?rev=145032&r1=145031&r2=145032&view=diff
==============================================================================
--- vmkit/trunk/tools/vmjc/vmjc.cpp (original)
+++ vmkit/trunk/tools/vmjc/vmjc.cpp Mon Nov 21 04:28:44 2011
@@ -38,7 +38,7 @@
#include "llvm/Target/TargetMachine.h"
-#include "MvmGC.h"
+#include "VmkitGC.h"
#include "vmkit/JIT.h"
#include "vmkit/VirtualMachine.h"
#include "vmkit/Thread.h"
More information about the vmkit-commits
mailing list