Changeset 272

Timestamp:

Dec 9, 2002, 5:49:31 PM (18 years ago)

Author:

pooh

Message:

• More minor cleanups.

File:

• to-imperative/trunk/libp++/pxx_heap_allocator.cc (modified) (3 diffs)

to-imperative/trunk/libp++/pxx_heap_allocator.cc

@@ -45 +45 @@
   for (unsigned i = 0; i < sizeof(size_t) * 8; i++)
     lists[i].size = exps_of_two[i];
-  BlockHeader* p = reinterpret_cast<BlockHeader*>(start_addr);
+  BlockHeader* p = static_cast<BlockHeader*>(start_addr);
   (lists + get_order(current_size))->put(p);
 }
@@ -105 +105 @@
 void HeapAllocator::deallocate (void* _ptr)
 {
+  BlockHeader* start = static_cast<BlockHeader*>(start_addr);
   //
   // Shift a pointer to a real start of memory block
@@ -113 +114 @@
   //
   // Loop and glue adjacent free blocks
-  while (size < current_size) {
+  for (; size < current_size; size <<= 1) {
     //
     // Get a pointer to appropriate adjacent block
-    BlockHeader* q =
-      (BlockHeader*)ptr_add_offset(start_addr, (ptr_sub(p, start_addr) ^ size));
-    //
-    // If it is free...
-    if (q->size == size) {
-      //
-      // ...delete it from list
-      q->remove();
-      //
-      // Obtain a pointer to combined free block
-      p = (BlockHeader*)ptr_add_offset(start_addr,
-        ptr_sub(p, start_addr) & ptr_sub(q, start_addr));
-      //
-      // Advance a size
-      size <<= 1;
-    }
-    //
-    // If it is allocated...
-    else break;
+    BlockHeader* q = ptr_add_offset(start, (ptr_sub(p, start) ^ size));
+    //
+    // If it is allocated or has wrong size
+    if (size != q->size) break;
+    //
+    // Delete a block from free block list
+    q->remove();
+    //
+    // Obtain a pointer to combined free block
+    p = ptr_add_offset(start, ptr_sub(p, start) & ptr_sub(q, start));
   }
   //