webapps.wiki: adding search bar

[factor.git] / vm / tenured_space.hpp

diff --git a/vm/tenured_space.hpp b/vm/tenured_space.hpp
index 1b1ff5369c82dbd74e3e2fe5ff8b99ccceeb2ccf..2fff0515ad7cd6e43e18d583d42270413aea6ef2 100644 (file)
--- a/vm/tenured_space.hpp
+++ b/vm/tenured_space.hpp
@@ -1,56 +1,41 @@
-namespace factor
-{
+namespace factor {
 
 struct tenured_space : free_list_allocator<object> {
-       object_start_map starts;
-
-       explicit tenured_space(cell size, cell start) :
-               free_list_allocator<object>(size,start), starts(size,start) {}
-
-       object *allot(cell size)
-       {
-               object *obj = free_list_allocator<object>::allot(size);
-               if(obj)
-               {
-                       starts.record_object_start_offset(obj);
-                       return obj;
-               }
-               else
-                       return NULL;
-       }
-
-       cell first_object()
-       {
-               return (cell)next_allocated_block_after(this->first_block());
-       }
-
-       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(obj);
-       }
-
-       void set_marked_p(object *obj)
-       {
-               this->state.set_marked_p(obj);
-       }
-
-       void sweep()
-       {
-               free_list_allocator<object>::sweep();
-               starts.update_for_sweep(&this->state);
-       }
+  object_start_map starts;
+
+  tenured_space(cell size, cell start)
+      : free_list_allocator<object>(size, start), starts(size, start) {}
+
+  object* allot(cell size) {
+    object* obj = free_list_allocator<object>::allot(size);
+    if (obj) {
+      starts.record_object_start_offset(obj);
+      return obj;
+    }
+    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 next_allocated_object_after(this->start);
+  }
+
+  cell next_object_after(cell scan) {
+    cell size = ((object*)scan)->size();
+    return next_allocated_object_after(scan + size);
+  }
+
+  void sweep() {
+    free_list_allocator<object>::sweep();
+    starts.update_for_sweep(&this->state);
+  }
 };
 
 }