webapps.wiki: adding search bar

[factor.git] / vm / tenured_space.hpp

diff --git a/vm/tenured_space.hpp b/vm/tenured_space.hpp
index a700b58bfd576bbefb55aed4b139865e5ee39927..2fff0515ad7cd6e43e18d583d42270413aea6ef2 100644 (file)
--- a/vm/tenured_space.hpp
+++ b/vm/tenured_space.hpp
@@ -1,33 +1,41 @@
-namespace factor
-{
-
-struct tenured_space_layout {
-       cell block_size(object *block)
-       {
-               if(block->free_p())
-               {
-                       free_heap_block *free_block = (free_heap_block *)block;
-                       return free_block->size();
-               }
-               else
-                       return block->size();
-       }
-};
+namespace factor {
+
+struct tenured_space : free_list_allocator<object> {
+  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;
+  }
 
-struct tenured_space : zone {
-       object_start_map starts;
+  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;
+  }
 
-       tenured_space(cell size, cell start) :
-               zone(size,start), starts(size,start) {}
+  cell first_object() {
+    return next_allocated_object_after(this->start);
+  }
 
-       object *allot(cell size)
-       {
-               if(here + size > end) return NULL;
+  cell next_object_after(cell scan) {
+    cell size = ((object*)scan)->size();
+    return next_allocated_object_after(scan + size);
+  }
 
-               object *obj = zone::allot(size);
-               starts.record_object_start_offset(obj);
-               return obj;
-       }
+  void sweep() {
+    free_list_allocator<object>::sweep();
+    starts.update_for_sweep(&this->state);
+  }
 };
 
 }