Merge r3481 to branches/1.3 to increase the number of maps...

src/serialize.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 1774 matching lines @@
     PagedSpace* space;
     switch (space_index) {
       case OLD_DATA_SPACE: space = Heap::old_data_space(); break;
       case OLD_POINTER_SPACE: space = Heap::old_pointer_space(); break;
       case MAP_SPACE: space = Heap::map_space(); break;
       case CODE_SPACE: space = Heap::code_space(); break;
       case CELL_SPACE: space = Heap::cell_space(); break;
       default: UNREACHABLE(); space = NULL; break;
     }
     ASSERT(size <= Page::kPageSize - Page::kObjectStartOffset);
-    int current_page = old_fullness >> Page::kPageSizeBits;
+    int current_page = old_fullness >> kPageSizeBits;
     int new_fullness = old_fullness + size;
-    int new_page = new_fullness >> Page::kPageSizeBits;
+    int new_page = new_fullness >> kPageSizeBits;
     // What is our new position within the current page.
     int intra_page_offset = new_fullness - current_page * Page::kPageSize;
     if (intra_page_offset > Page::kPageSize - Page::kObjectStartOffset) {
       // This object will not fit in a page and we have to move to the next.
       new_page = current_page + 1;
-      old_fullness = new_page << Page::kPageSizeBits;
+      old_fullness = new_page << kPageSizeBits;
       new_fullness = old_fullness + size;
       record_page = true;
     }
     fullness_[space_index] = new_fullness;
     Object* new_allocation = space->AllocateRaw(size);
     new_object = HeapObject::cast(new_allocation);
     ASSERT(!new_object->IsFailure());
     ASSERT((reinterpret_cast<intptr_t>(new_object->address()) &
             Page::kPageAlignmentMask) ==
            (old_fullness & Page::kPageAlignmentMask) +
@@ skipping 41 matching lines @@
         pages_[LO_SPACE][fullness_[LO_SPACE] - offset]);
   }
   offset <<= kObjectAlignmentBits;
   if (space == NEW_SPACE) {
     // New space has only one space - numbered 0.
     return HeapObject::FromAddress(
         pages_[space][0] + fullness_[space] - offset);
   }
   ASSERT(SpaceIsPaged(space));
   int virtual_address = fullness_[space] - offset;
-  int page_of_pointee = (virtual_address) >> Page::kPageSizeBits;
+  int page_of_pointee = (virtual_address) >> kPageSizeBits;
   Address object_address = pages_[space][page_of_pointee] +
                            (virtual_address & Page::kPageAlignmentMask);
   return HeapObject::FromAddress(object_address);
 }
 
 
 void Deserializer2::Deserialize() {
   // Don't GC while deserializing - just expand the heap.
   AlwaysAllocateScope always_allocate;
   // Don't use the free lists while deserializing.
@@ skipping 366 matching lines @@
       fullness_[space] = RoundUp(fullness_[space], Page::kPageSize);
     }
   }
   int allocation_address = fullness_[space];
   fullness_[space] = allocation_address + size;
   return allocation_address;
 }
 
 
 } }  // namespace v8::internal