Minor cleanup of StoreBuffer related heap iteration methods.

src/store-buffer.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 19 matching lines @@
 
 #include "allocation.h"
 #include "checks.h"
 #include "globals.h"
 #include "platform.h"
 #include "v8globals.h"
 
 namespace v8 {
 namespace internal {
 
+class StoreBuffer;
 
 typedef void (*ObjectSlotCallback)(HeapObject** from, HeapObject* to);
 
+typedef void (StoreBuffer::*RegionCallback)(
+    Address start, Address end, ObjectSlotCallback slot_callback);
 
 // Used to implement the write barrier by collecting addresses of pointers
 // between spaces.
 class StoreBuffer {
  public:
   explicit StoreBuffer(Heap* heap);
 
   static void StoreBufferOverflow(Isolate* isolate);
 
   inline Address TopAddress();
@@ skipping 90 matching lines @@
   uintptr_t* hash_map_1_;
   uintptr_t* hash_map_2_;
 
   void CheckForFullBuffer();
   void Uniq();
   void ZapHashTables();
   bool HashTablesAreZapped();
   void FilterScanOnScavengeEntries();
   void ExemptPopularPages(int prime_sample_step, int threshold);
 
+  void FindPointersToNewSpaceInRegion(Address start,
+                                      Address end,
+                                      ObjectSlotCallback slot_callback);
+
+  // For each region of pointers on a page in use from an old space call
+  // visit_pointer_region callback.
+  // If either visit_pointer_region or callback can cause an allocation
+  // in old space and changes in allocation watermark then
+  // can_preallocate_during_iteration should be set to true.
+  // All pages will be marked as having invalid watermark upon

[Erik Corry, 2011/06/13 08:16:39]

Given that we don't have watermarks any more, this comment should probably just
be deleted.

+  // iteration completion.
+  void IteratePointersOnPage(
+      PagedSpace* space,
+      Page* page,
+      RegionCallback region_callback,
+      ObjectSlotCallback slot_callback);
+
+  void FindPointersToNewSpaceInMaps(
+    Address start,
+    Address end,
+    ObjectSlotCallback slot_callback);
+
+  void FindPointersToNewSpaceInMapsRegion(
+    Address start,
+    Address end,
+    ObjectSlotCallback slot_callback);
+
+  void FindPointersToNewSpaceOnPage(
+    PagedSpace* space,
+    Page* page,
+    RegionCallback region_callback,
+    ObjectSlotCallback slot_callback);
+
+#ifdef DEBUG
+  void VerifyPointers(PagedSpace* space, RegionCallback region_callback);
+  void VerifyPointers(LargeObjectSpace* space);
+#endif
+
   friend class StoreBufferRebuildScope;
   friend class DontMoveStoreBufferEntriesScope;
 };
 
 
 class StoreBufferRebuildScope {
  public:
   explicit StoreBufferRebuildScope(Heap* heap,
                                    StoreBuffer* store_buffer,
                                    StoreBufferCallback callback)
@@ skipping 33 matching lines @@
   }
 
  private:
   StoreBuffer* store_buffer_;
   bool stored_state_;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_STORE_BUFFER_H_