Changeset 2945

Timestamp:

12/09/07 20:22:48 (13 months ago)

Author:

mokehehe

Message:

未使用のセルをリストにして、そこから取り出すように。
（ガベコレ組込み準備）

Files:

• lang/c/misc/mlisp/src/mlisp.cpp (modified) (6 diffs)

lang/c/misc/mlisp/src/mlisp.cpp

@@ -142 +142 @@
 
 private:
+        void collect_garbage();
+
         SExp read_string(FILE* fp);
         SExp read_list(FILE* fp);
@@ -166 +168 @@
 
         Cell g_cell_buf[MAX_CELL];
-        int g_cell_free_p;
+        SExp g_free_cell;
+        int free_cell_num;
 
         Symbol g_symbol_buf[MAX_SYMBOL];
@@ -244 +247 @@
         memset(flags, 0x00, sizeof(flags));
 
-        g_cell_free_p = 0;
         g_symbol_free_p = 0;
         g_stack_p = 0;
         g_builtin_p = 0;
+
+                // �Z������‚Ȃ��āA�t���[�Z���Ƃ���        for (int i=0; i<MAX_CELL-1; ++i) {
+                Cell* p = &g_cell_buf[i];
+                p->cdr = MAKE_SEXP(tCell, i+1);
+        }
+        Cell* p = &g_cell_buf[MAX_CELL-1];
+        p->cdr = cNil;
+        g_free_cell = MAKE_SEXP(tCell, 0);
+        free_cell_num = MAX_CELL;
 }
 
@@ -261 +272 @@
 void MLContext::dump()
 {
-        printf("#cell:%d\n", g_cell_free_p);
         printf("#symbol:%d\n", g_symbol_free_p);
         for (int i=0; i<g_symbol_free_p; ++i) {
@@ -267 +277 @@
         }
         printf("\n");
+        printf("#free cell:%d\n", free_cell_num);
 }
 
@@ -287 +298 @@
 }
 
+void MLContext::collect_garbage()
+{
+        assert(!"not implemented");
+}
+
 SExp MLContext::cons(SExp a, SExp d)
 {
-        assert(g_cell_free_p < MAX_CELL);
-        int idx = g_cell_free_p++;
+        if (g_free_cell == cNil) {
+                collect_garbage();
+        }
+        SExp res = g_free_cell;
+        assert(SEXP_TYPE(res) == tCell);
+        assert(free_cell_num > 0);
+        g_free_cell = cdr(res);
+        --free_cell_num;
+
+        int idx = SEXP_UVAL(res);
 
         Cell* p = &g_cell_buf[idx];