X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FAllocator.cpp;h=90df262336c59a36ddb4e3c11fbab39e32ce25c0;hb=335db223926931db204bf54d4accac6677b8e6b1;hp=f5a207844b859c86df1b67a83aa9bd144a1475a0;hpb=95eb3ad353460c6987a9d1e03a3e3e12c75b4059;p=oota-llvm.git

diff --git a/lib/Support/Allocator.cpp b/lib/Support/Allocator.cpp
index f5a207844b8..90df262336c 100644
--- a/lib/Support/Allocator.cpp
+++ b/lib/Support/Allocator.cpp
@@ -12,18 +12,18 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Support/Allocator.h"
+#include "llvm/System/DataTypes.h"
 #include "llvm/Support/Recycler.h"
-#include "llvm/Support/DataTypes.h"
-#include "llvm/Support/Streams.h"
+#include "llvm/Support/raw_ostream.h"
+#include "llvm/System/Memory.h"
+#include <cstring>
 
 namespace llvm {
 
 BumpPtrAllocator::BumpPtrAllocator(size_t size, size_t threshold,
                                    SlabAllocator &allocator)
     : SlabSize(size), SizeThreshold(threshold), Allocator(allocator),
-      CurSlab(0), BytesAllocated(0) {
-  StartNewSlab();
-}
+      CurSlab(0), BytesAllocated(0) { }
 
 BumpPtrAllocator::~BumpPtrAllocator() {
   DeallocateSlabs(CurSlab);
@@ -48,7 +48,7 @@ void BumpPtrAllocator::StartNewSlab() {
   NewSlab->NextPtr = CurSlab;
   CurSlab = NewSlab;
   CurPtr = (char*)(CurSlab + 1);
-  End = CurPtr + CurSlab->Size;
+  End = ((char*)CurSlab) + CurSlab->Size;
 }
 
 /// DeallocateSlabs - Deallocate all memory slabs after and including this
@@ -59,6 +59,7 @@ void BumpPtrAllocator::DeallocateSlabs(MemSlab *Slab) {
 #ifndef NDEBUG
     // Poison the memory so stale pointers crash sooner.  Note we must
     // preserve the Size and NextPtr fields at the beginning.
+    sys::Memory::setRangeWritable(Slab + 1, Slab->Size - sizeof(MemSlab));
     memset(Slab + 1, 0xCD, Slab->Size - sizeof(MemSlab));
 #endif
     Allocator.Deallocate(Slab);
@@ -69,15 +70,20 @@ void BumpPtrAllocator::DeallocateSlabs(MemSlab *Slab) {
 /// Reset - Deallocate all but the current slab and reset the current pointer
 /// to the beginning of it, freeing all memory allocated so far.
 void BumpPtrAllocator::Reset() {
+  if (!CurSlab)
+    return;
   DeallocateSlabs(CurSlab->NextPtr);
   CurSlab->NextPtr = 0;
   CurPtr = (char*)(CurSlab + 1);
-  End = CurPtr + CurSlab->Size;
+  End = ((char*)CurSlab) + CurSlab->Size;
 }
 
 /// Allocate - Allocate space at the specified alignment.
 ///
 void *BumpPtrAllocator::Allocate(size_t Size, size_t Alignment) {
+  if (!CurSlab) // Start a new slab if we haven't allocated one already.
+    StartNewSlab();
+
   // Keep track of how many bytes we've allocated.
   BytesAllocated += Size;
 
@@ -88,14 +94,14 @@ void *BumpPtrAllocator::Allocate(size_t Size, size_t Alignment) {
   char *Ptr = AlignPtr(CurPtr, Alignment);
 
   // Check if we can hold it.
-  if (Ptr + Size < End) {
+  if (Ptr + Size <= End) {
     CurPtr = Ptr + Size;
     return Ptr;
   }
 
   // If Size is really big, allocate a separate slab for it.
-  if (Size > SizeThreshold) {
-    size_t PaddedSize = Size + sizeof(MemSlab) + Alignment - 1;
+  size_t PaddedSize = Size + sizeof(MemSlab) + Alignment - 1;
+  if (PaddedSize > SizeThreshold) {
     MemSlab *NewSlab = Allocator.Allocate(PaddedSize);
 
     // Put the new slab after the current slab, since we are not allocating
@@ -104,7 +110,7 @@ void *BumpPtrAllocator::Allocate(size_t Size, size_t Alignment) {
     CurSlab->NextPtr = NewSlab;
 
     Ptr = AlignPtr((char*)(NewSlab + 1), Alignment);
-    assert((uintptr_t)Ptr + Size < (uintptr_t)NewSlab + NewSlab->Size);
+    assert((uintptr_t)Ptr + Size <= (uintptr_t)NewSlab + NewSlab->Size);
     return Ptr;
   }
 
@@ -112,7 +118,7 @@ void *BumpPtrAllocator::Allocate(size_t Size, size_t Alignment) {
   StartNewSlab();
   Ptr = AlignPtr(CurPtr, Alignment);
   CurPtr = Ptr + Size;
-  assert(CurPtr < End && "Unable to allocate memory!");
+  assert(CurPtr <= End && "Unable to allocate memory!");
   return Ptr;
 }
 
@@ -132,11 +138,11 @@ void BumpPtrAllocator::PrintStats() const {
     ++NumSlabs;
   }
 
-  cerr << "\nNumber of memory regions: " << NumSlabs << '\n'
-       << "Bytes used: " << BytesAllocated << '\n'
-       << "Bytes allocated: " << TotalMemory << '\n'
-       << "Bytes wasted: " << (TotalMemory - BytesAllocated)
-       << " (includes alignment, etc)\n";
+  errs() << "\nNumber of memory regions: " << NumSlabs << '\n'
+         << "Bytes used: " << BytesAllocated << '\n'
+         << "Bytes allocated: " << TotalMemory << '\n'
+         << "Bytes wasted: " << (TotalMemory - BytesAllocated)
+         << " (includes alignment, etc)\n";
 }
 
 MallocSlabAllocator BumpPtrAllocator::DefaultSlabAllocator =
@@ -160,9 +166,9 @@ void MallocSlabAllocator::Deallocate(MemSlab *Slab) {
 void PrintRecyclerStats(size_t Size,
                         size_t Align,
                         size_t FreeListSize) {
-  cerr << "Recycler element size: " << Size << '\n'
-       << "Recycler element alignment: " << Align << '\n'
-       << "Number of elements free for recycling: " << FreeListSize << '\n';
+  errs() << "Recycler element size: " << Size << '\n'
+         << "Recycler element alignment: " << Align << '\n'
+         << "Number of elements free for recycling: " << FreeListSize << '\n';
 }
 
 }