[vmkit-commits] [vmkit] r134241 - in /vmkit/trunk/lib: J3/VMCore/LockedMap.h Mvm/Compiler/InlineMalloc.cpp Mvm/MMTk/MutatorThread.cpp Mvm/MMTk/MvmGC.h Mvm/Runtime/LLVMAssembly.ll Mvm/Runtime/LLVMAssembly64.ll Mvm/Runtime/Object.cpp Mvm/Runtime/UTF8.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Fri Jul 1 10:01:34 PDT 2011
Author: geoffray
Date: Fri Jul 1 12:01:34 2011
New Revision: 134241
URL: http://llvm.org/viewvc/llvm-project?rev=134241&view=rev
Log:
More cleanup.
Removed:
vmkit/trunk/lib/Mvm/MMTk/MutatorThread.cpp
vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly.ll
vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly64.ll
Modified:
vmkit/trunk/lib/J3/VMCore/LockedMap.h
vmkit/trunk/lib/Mvm/Compiler/InlineMalloc.cpp
vmkit/trunk/lib/Mvm/MMTk/MvmGC.h
vmkit/trunk/lib/Mvm/Runtime/Object.cpp
vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp
Modified: vmkit/trunk/lib/J3/VMCore/LockedMap.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/LockedMap.h?rev=134241&r1=134240&r2=134241&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/LockedMap.h (original)
+++ vmkit/trunk/lib/J3/VMCore/LockedMap.h Fri Jul 1 12:01:34 2011
@@ -71,7 +71,7 @@
TLock lock;
std::map<const Key, Container, Compare,
- gc_allocator<std::pair<const Key, Container> > > map;
+ std::allocator<std::pair<const Key, Container> > > map;
inline Container lookupOrCreate(Key& V, Meta meta, funcCreate func) {
Container res = 0;
Modified: vmkit/trunk/lib/Mvm/Compiler/InlineMalloc.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/InlineMalloc.cpp?rev=134241&r1=134240&r2=134241&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/InlineMalloc.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/InlineMalloc.cpp Fri Jul 1 12:01:34 2011
@@ -34,11 +34,6 @@
};
char InlineMalloc::ID = 0;
-#if 0
- static RegisterPass<InlineMalloc> X("InlineMalloc",
- "Inline calls to gcmalloc");
-#endif
-
bool InlineMalloc::runOnFunction(Function& F) {
Function* Malloc = F.getParent()->getFunction("gcmalloc");
Removed: vmkit/trunk/lib/Mvm/MMTk/MutatorThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/MutatorThread.cpp?rev=134240&view=auto
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MutatorThread.cpp (original)
+++ vmkit/trunk/lib/Mvm/MMTk/MutatorThread.cpp (removed)
@@ -1,14 +0,0 @@
-//===--------- MutatorThread.cpp - Thread for GC --------------------------===//
-//
-// The VMKit project
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-
-#include "MutatorThread.h"
-#include "MvmGC.h"
-
-using namespace mvm;
Modified: vmkit/trunk/lib/Mvm/MMTk/MvmGC.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/MvmGC.h?rev=134241&r1=134240&r2=134241&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MvmGC.h (original)
+++ vmkit/trunk/lib/Mvm/MMTk/MvmGC.h Fri Jul 1 12:01:34 2011
@@ -14,8 +14,6 @@
#include "mvm/GC/GC.h"
#include <cstdlib>
-#define gc_allocator std::allocator
-
class VirtualTable {
public:
uintptr_t destructor;
Removed: vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly.ll?rev=134240&view=auto
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly.ll (original)
+++ vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly.ll (removed)
@@ -1,31 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Atomic ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-declare i8 @llvm.atomic.cmp.swap.i8.p0i8(i8*, i8, i8) nounwind
-declare i16 @llvm.atomic.cmp.swap.i16.p0i16(i16*, i16, i16) nounwind
-declare i32 @llvm.atomic.cmp.swap.i32.p0i32(i32*, i32, i32) nounwind
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;Helper functions for gcc < 4.2 ;;;;;;;;;;;;;;;;;;;;;;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-define i8 @llvm_atomic_cmp_swap_i8(i8* %ptr, i8 %cmp, i8 %swap)
-nounwind {
- %A = call i8 @llvm.atomic.cmp.swap.i8.p0i8( i8* %ptr, i8 %cmp, i8 %swap)
- ret i8 %A
-}
-
-define i16 @llvm_atomic_cmp_swap_i16(i16* %ptr, i16 %cmp, i16 %swap)
-nounwind {
- %A = call i16 @llvm.atomic.cmp.swap.i16.p0i16( i16* %ptr, i16 %cmp, i16 %swap)
- ret i16 %A
-}
-
-define i32 @llvm_atomic_cmp_swap_i32(i32* %ptr, i32 %cmp, i32 %swap)
-nounwind {
- %A = call i32 @llvm.atomic.cmp.swap.i32.p0i32(i32* %ptr, i32 %cmp, i32 %swap)
- ret i32 %A
-}
-
-
Removed: vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly64.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly64.ll?rev=134240&view=auto
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly64.ll (original)
+++ vmkit/trunk/lib/Mvm/Runtime/LLVMAssembly64.ll (removed)
@@ -1,7 +0,0 @@
-declare i64 @llvm.atomic.cmp.swap.i64.p0i64(i64*, i64, i64) nounwind
-
-define i64 @llvm_atomic_cmp_swap_i64(i64* %ptr, i64 %cmp, i64 %swap)
-nounwind {
- %A = call i64 @llvm.atomic.cmp.swap.i64.p0i64( i64* %ptr, i64 %cmp, i64 %swap)
- ret i64 %A
-}
Modified: vmkit/trunk/lib/Mvm/Runtime/Object.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/Object.cpp?rev=134241&r1=134240&r2=134241&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/Object.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/Object.cpp Fri Jul 1 12:01:34 2011
@@ -1,6 +1,6 @@
-//===--------- Object.cc - Common objects for vmlets ----------------------===//
+//===--------- Object.cpp - Common objects GC objects ---------------------===//
//
-// The Micro Virtual Machine
+// The VMKit project
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
Modified: vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp?rev=134241&r1=134240&r2=134241&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/UTF8.cpp Fri Jul 1 12:01:34 2011
@@ -1,3 +1,12 @@
+//===------------- UTF8.cpp - Common UTF8 functions -----------------------===//
+//
+// The VMKit project
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
#include "mvm/Allocator.h"
#include "mvm/UTF8.h"
#include "mvm/PrintBuffer.h"
More information about the vmkit-commits
mailing list