Unify markbits for old and new spaces.

src/mark-compact.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 31 matching lines @@
 // Forward declarations.
 class CodeFlusher;
 class GCTracer;
 class MarkingVisitor;
 class RootMarkingVisitor;
 
 
 class Marking {
  public:
   explicit Marking(Heap* heap)
-      : heap_(heap),
-        new_space_bitmap_(NULL) {
+      : heap_(heap) {
   }
 
-  inline MarkBit MarkBitFromNewSpace(HeapObject* obj);
+  static inline MarkBit MarkBitFrom(Address addr);
 
-  static inline MarkBit MarkBitFromOldSpace(HeapObject* obj);
-
-  inline MarkBit MarkBitFrom(Address addr);
-
-  // For embedding in generated code.
-  inline Address new_space_bitmap() {
-    return reinterpret_cast<Address>(new_space_bitmap_);
-  }
-
-  inline MarkBit MarkBitFrom(HeapObject* obj) {
+  static inline MarkBit MarkBitFrom(HeapObject* obj) {
     return MarkBitFrom(reinterpret_cast<Address>(obj));
   }
 
-  inline void ClearRange(Address addr, int size);
-
   void TransferMark(Address old_start, Address new_start);
 
   bool Setup();
 
   void TearDown();
 
  private:
-  class BitmapStorageDescriptor {
-   public:
-    INLINE(static int CellsCount(Address addr)) {
-      return HeaderOf(addr)->cells_count_;
-    }
-
-    static Bitmap<BitmapStorageDescriptor>* Allocate(int cells_count) {
-      VirtualMemory* memory = new VirtualMemory(SizeFor(cells_count));
-
-      if (!memory->Commit(memory->address(), memory->size(), false)) {
-        delete memory;
-        return NULL;
-      }
-
-      Address bitmap_address =
-          reinterpret_cast<Address>(memory->address()) + sizeof(Header);
-      HeaderOf(bitmap_address)->cells_count_ = cells_count;
-      HeaderOf(bitmap_address)->storage_ = memory;
-      return Bitmap<BitmapStorageDescriptor>::FromAddress(bitmap_address);
-    }
-
-    static void Free(Bitmap<BitmapStorageDescriptor>* bitmap) {
-      delete HeaderOf(bitmap->address())->storage_;
-    }
-
-   private:
-    struct Header {
-      VirtualMemory* storage_;
-      int cells_count_;
-    };
-
-    static int SizeFor(int cell_count) {
-      return sizeof(Header) +
-          Bitmap<BitmapStorageDescriptor>::SizeFor(cell_count);
-    }
-
-    static Header* HeaderOf(Address addr) {
-      return reinterpret_cast<Header*>(addr - sizeof(Header));
-    }
-  };
-
-  typedef Bitmap<BitmapStorageDescriptor> NewSpaceMarkbitsBitmap;
-
   Heap* heap_;
-  NewSpaceMarkbitsBitmap* new_space_bitmap_;
 };
 
 // ----------------------------------------------------------------------------
 // Marking deque for tracing live objects.
 
 class MarkingDeque {
  public:
   MarkingDeque()
       : array_(NULL), top_(0), bottom_(0), mask_(0), overflowed_(false) { }
 
@@ skipping 378 matching lines @@
   CodeFlusher* code_flusher_;
 
   friend class Heap;
   friend class OverflowedObjectsScanner;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_MARK_COMPACT_H_