Changeset 635 for abuse/trunk/src/lisp/lisp_gc.cppTweet

Timestamp:

May 11, 2011, 1:26:11 AM (11 years ago)

Author:

Sam Hocevar

Message:

lisp: refactor Lisp spaces so that they are real objects, and get rid
of the unused USER_SPACE.

File:

• abuse/trunk/src/lisp/lisp_gc.cpp (modified) (2 diffs)

abuse/trunk/src/lisp/lisp_gc.cpp

@@ -205 +205 @@
 }
 
-void LispGC::CollectSpace(int which_space, int grow)
-{
-    int old_space = current_space;
-    cstart = space[which_space];
-    cend = free_space[which_space];
-
-    space_size[GC_SPACE] = space_size[which_space];
+void LispGC::CollectSpace(LSpace *which_space, int grow)
+{
+    LSpace *old_space = LSpace::Current;
+    cstart = which_space->m_data;
+    cend = which_space->m_free;
+
+    LSpace::Gc.m_size = which_space->m_size;
     if (grow)
     {
-        space_size[GC_SPACE] += space_size[which_space] >> 1;
-        space_size[GC_SPACE] -= (space_size[GC_SPACE] & 7);
-    }
-    uint8_t *new_space = (uint8_t *)malloc(space_size[GC_SPACE]);
-    current_space = GC_SPACE;
-    free_space[GC_SPACE] = space[GC_SPACE] = new_space;
-
-    collected_start = new_space;
-    collected_end = new_space + space_size[GC_SPACE];
+        LSpace::Gc.m_size += which_space->m_size >> 1;
+        LSpace::Gc.m_size -= (LSpace::Gc.m_size & 7);
+    }
+    uint8_t *new_data = (uint8_t *)malloc(LSpace::Gc.m_size);
+    LSpace::Current = &LSpace::Gc;
+    LSpace::Gc.m_free = LSpace::Gc.m_data = new_data;
+
+    collected_start = new_data;
+    collected_end = new_data + LSpace::Gc.m_size;
 
     CollectSymbols(LSymbol::root);
@@ -228 +228 @@
 
     // for debuging clear it out
-    memset(space[which_space], 0, space_size[which_space]);
-    free(space[which_space]);
-
-    space[which_space] = new_space;
-    space_size[which_space] = space_size[GC_SPACE];
-    free_space[which_space] = new_space
-                            + (free_space[GC_SPACE] - space[GC_SPACE]);
-    current_space = old_space;
-}
-
+    memset(which_space->m_data, 0, which_space->m_size);
+    free(which_space->m_data);
+
+    which_space->m_data = new_data;
+    which_space->m_size = LSpace::Gc.m_size;
+    which_space->m_free = new_data + (LSpace::Gc.m_free - LSpace::Gc.m_data);
+    LSpace::Current = old_space;
+}
+