webapps.wiki: adding search bar

[factor.git] / vm / tenured_space.hpp

diff --git a/vm/tenured_space.hpp b/vm/tenured_space.hpp
index c163e9c0c2c9e78aab976a45be69fceeb5b2d104..2fff0515ad7cd6e43e18d583d42270413aea6ef2 100644 (file)
--- a/vm/tenured_space.hpp
+++ b/vm/tenured_space.hpp
@@ -11,28 +11,25 @@ struct tenured_space : free_list_allocator<object> {
     if (obj) {
       starts.record_object_start_offset(obj);
       return obj;
-    } else
-      return NULL;
+    }
+    return NULL;
+  }
+
+  cell next_allocated_object_after(cell scan) {
+    while (scan != this->end && ((object*)scan)->free_p()) {
+      free_heap_block* free_block = (free_heap_block*)scan;
+      scan = (cell)free_block + free_block->size();
+    }
+    return scan == this->end ? 0 : scan;
   }
 
   cell first_object() {
-    return (cell)next_allocated_block_after((object*)this->start);
+    return next_allocated_object_after(this->start);
   }
 
   cell next_object_after(cell scan) {
     cell size = ((object*)scan)->size();
-    object* next = (object*)(scan + size);
-    return (cell)next_allocated_block_after(next);
-  }
-
-  void clear_mark_bits() { state.clear_mark_bits(); }
-
-  bool marked_p(object* obj) {
-    return this->state.marked_p((cell)obj);
-  }
-
-  void set_marked_p(object* obj) {
-    this->state.set_marked_p((cell)obj, obj->size());
+    return next_allocated_object_after(scan + size);
   }
 
   void sweep() {