Reverting r4685, r4686, r4687

test/cctest/test-spaces.cc

 // Copyright 2006-2008 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 14 matching lines @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <stdlib.h>
 
 #include "v8.h"
 #include "cctest.h"
 
 using namespace v8::internal;
 
-static void VerifyRegionMarking(Address page_start) {
+static void VerifyRSet(Address page_start) {
+#ifdef DEBUG
+  Page::set_rset_state(Page::IN_USE);
+#endif
+
   Page* p = Page::FromAddress(page_start);
 
-  p->SetRegionMarks(Page::kAllRegionsCleanMarks);
+  p->ClearRSet();
 
   for (Address addr = p->ObjectAreaStart();
        addr < p->ObjectAreaEnd();
        addr += kPointerSize) {
-    CHECK(!Page::FromAddress(addr)->IsRegionDirty(addr));
+    CHECK(!Page::IsRSetSet(addr, 0));
   }
 
   for (Address addr = p->ObjectAreaStart();
        addr < p->ObjectAreaEnd();
        addr += kPointerSize) {
-    Page::FromAddress(addr)->MarkRegionDirty(addr);
+    Page::SetRSet(addr, 0);
   }
 
   for (Address addr = p->ObjectAreaStart();
        addr < p->ObjectAreaEnd();
        addr += kPointerSize) {
-    CHECK(Page::FromAddress(addr)->IsRegionDirty(addr));
+    CHECK(Page::IsRSetSet(addr, 0));
   }
 }
 
 
 TEST(Page) {
+#ifdef DEBUG
+  Page::set_rset_state(Page::NOT_IN_USE);
+#endif
+
   byte* mem = NewArray<byte>(2*Page::kPageSize);
   CHECK(mem != NULL);
 
   Address start = reinterpret_cast<Address>(mem);
   Address page_start = RoundUp(start, Page::kPageSize);
 
   Page* p = Page::FromAddress(page_start);
   CHECK(p->address() == page_start);
   CHECK(p->is_valid());
 
   p->opaque_header = 0;
   p->SetIsLargeObjectPage(false);
   CHECK(!p->next_page()->is_valid());
 
   CHECK(p->ObjectAreaStart() == page_start + Page::kObjectStartOffset);
   CHECK(p->ObjectAreaEnd() == page_start + Page::kPageSize);
 
   CHECK(p->Offset(page_start + Page::kObjectStartOffset) ==
         Page::kObjectStartOffset);
   CHECK(p->Offset(page_start + Page::kPageSize) == Page::kPageSize);
 
   CHECK(p->OffsetToAddress(Page::kObjectStartOffset) == p->ObjectAreaStart());
   CHECK(p->OffsetToAddress(Page::kPageSize) == p->ObjectAreaEnd());
 
-  // test region marking
-  VerifyRegionMarking(page_start);
+  // test remember set
+  VerifyRSet(page_start);
 
   DeleteArray(mem);
 }
 
 
 TEST(MemoryAllocator) {
   CHECK(Heap::ConfigureHeapDefault());
   CHECK(MemoryAllocator::Setup(Heap::MaxReserved()));
 
   OldSpace faked_space(Heap::MaxReserved(), OLD_POINTER_SPACE, NOT_EXECUTABLE);
@@ skipping 134 matching lines @@
   CHECK(!lo->IsEmpty());
 
   obj = lo->AllocateRaw(lo_size);
   CHECK(obj->IsFailure());
 
   lo->TearDown();
   delete lo;
 
   MemoryAllocator::TearDown();
 }