[vmkit-commits] [vmkit] r73695 - in /vmkit/trunk: include/mvm/Allocator.h lib/N3/VMCore/N3.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Thu Jun 18 08:19:26 2009
New Revision: 73695

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


Modified:
    vmkit/trunk/include/mvm/Allocator.h
    vmkit/trunk/lib/N3/VMCore/N3.cpp

Modified: vmkit/trunk/include/mvm/Allocator.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Allocator.h?rev=73695&r1=73694&r2=73695&view=diff

==============================================================================
--- vmkit/trunk/include/mvm/Allocator.h (original)
+++ vmkit/trunk/include/mvm/Allocator.h Thu Jun 18 08:19:26 2009
@@ -42,7 +42,7 @@
   SpinLock TheLock;
   llvm::BumpPtrAllocator Allocator;
 public:
-  void* Allocate(size_t sz) {
+  void* Allocate(size_t sz, const char* name) {
 #ifdef USE_GC_BOEHM
     return GC_MALLOC(sz);
 #else
@@ -60,16 +60,18 @@
 
 class PermanentObject {
 public:
-  void* operator new(size_t sz, BumpPtrAllocator& allocator) {
-    return allocator.Allocate(sz);
+  void* operator new(size_t sz, BumpPtrAllocator& allocator,
+                     const char* name) {
+    return allocator.Allocate(sz, name);
   }
 
   void operator delete(void* ptr) {
     free(ptr);
   }
 
-  void* operator new [](size_t sz, BumpPtrAllocator& allocator) {
-    return allocator.Allocate(sz);
+  void* operator new [](size_t sz, BumpPtrAllocator& allocator,
+                        const char* name) {
+    return allocator.Allocate(sz, name);
   }
 };
 

Modified: vmkit/trunk/lib/N3/VMCore/N3.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/N3.cpp?rev=73695&r1=73694&r2=73695&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/N3.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/N3.cpp Thu Jun 18 08:19:26 2009
@@ -59,7 +59,7 @@
 
 N3* N3::allocateBootstrap() {
   mvm::BumpPtrAllocator * A = new mvm::BumpPtrAllocator();
-  N3 *vm= new(*A) N3();
+  N3 *vm= new(*A, "VM") N3();
 
   std::string str = 
     mvm::MvmModule::executionEngine->getTargetData()->getStringRepresentation();
@@ -84,7 +84,7 @@
 
 N3* N3::allocate(const char* name, N3* parent) {
   mvm::BumpPtrAllocator * A = new mvm::BumpPtrAllocator();
-  N3 *vm= new(*A) N3();
+  N3 *vm= new(*A, "VM") N3();
   
   std::string str = 
     mvm::MvmModule::executionEngine->getTargetData()->getStringRepresentation();