Unify markbits for old and new spaces.

src/mark-compact-inl.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 17 matching lines @@
 #ifndef V8_MARK_COMPACT_INL_H_
 #define V8_MARK_COMPACT_INL_H_
 
 #include "isolate.h"
 #include "memory.h"
 #include "mark-compact.h"
 
 namespace v8 {
 namespace internal {
 
-MarkBit Marking::MarkBitFromNewSpace(HeapObject* obj) {
-  ASSERT(heap_->InNewSpace(obj));
-  uint32_t index = heap_->new_space()->AddressToMarkbitIndex(
-      reinterpret_cast<Address>(obj));
-  bool data_object = obj->map()->instance_type() == HEAP_NUMBER_TYPE;
-  return new_space_bitmap_->MarkBitFromIndex(index, data_object);
-}
 
-
-MarkBit Marking::MarkBitFromOldSpace(HeapObject* obj) {
-  ASSERT(!HEAP->InNewSpace(obj));
-  ASSERT(obj->IsHeapObject());
-  Address addr = reinterpret_cast<Address>(obj);
+MarkBit Marking::MarkBitFrom(Address addr) {
   Page *p = Page::FromAddress(addr);
   return p->markbits()->MarkBitFromIndex(p->AddressToMarkbitIndex(addr),
                                          p->ContainsOnlyData());
 }
 
 
-MarkBit Marking::MarkBitFrom(Address addr) {
-  if (heap_->InNewSpace(addr)) {
-    uint32_t index = heap_->new_space()->AddressToMarkbitIndex(addr);
-    return new_space_bitmap_->MarkBitFromIndex(index);
-  } else {
-    Page *p = Page::FromAddress(addr);
-    return p->markbits()->MarkBitFromIndex(p->AddressToMarkbitIndex(addr),
-                                           p->ContainsOnlyData());
-  }
-}
-
-
-void Marking::ClearRange(Address addr, int size) {
-  if (heap_->InNewSpace(addr)) {
-    uint32_t index = heap_->new_space()->AddressToMarkbitIndex(addr);
-    new_space_bitmap_->ClearRange(index, size >> kPointerSizeLog2);
-  } else {
-    Page *p = Page::FromAddress(addr);
-    p->markbits()->ClearRange(p->FastAddressToMarkbitIndex(addr),
-                              size >> kPointerSizeLog2);
-  }
-}
-
-
 void MarkCompactCollector::SetFlags(int flags) {
   force_compaction_ = ((flags & Heap::kForceCompactionMask) != 0);
   sweep_precisely_ = ((flags & Heap::kMakeHeapIterableMask) != 0);
 }
 
 
 void MarkCompactCollector::MarkObject(HeapObject* obj, MarkBit mark_bit) {
   ASSERT(heap()->marking()->MarkBitFrom(obj) == mark_bit);
   if (!mark_bit.Get()) {
     mark_bit.Set();
@@ skipping 18 matching lines @@
 bool MarkCompactCollector::IsMarked(Object* obj) {
   ASSERT(obj->IsHeapObject());
   HeapObject* heap_object = HeapObject::cast(obj);
   return heap_->marking()->MarkBitFrom(heap_object).Get();
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_MARK_COMPACT_INL_H_