Changeset 2949

Timestamp:

12/09/07 21:23:52 (13 months ago)

Author:

mokehehe

Message:

ガベコレを作り始める。
うまく動いてない。

Location:

lang/c/misc/mlisp/src

Files:

• ml_builtin.c (modified) (1 diff)
• mlisp.cpp (modified) (5 diffs)

lang/c/misc/mlisp/src/ml_builtin.c

@@ -264 +264 @@
                                 r = ml_read(ml, fp);
                                 if (r == cEOF)  break;
-                                ml_print(ml, stdout, r, FALSE);
+//                              ml_print(ml, stdout, r, FALSE);
 
                                 e = ml_eval(ml, r);
-                                ml_print(ml, stdout, e, FALSE);
+//                              ml_print(ml, stdout, e, FALSE);
                         }
 

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

@@ -75 +75 @@
         SExp car;
         SExp cdr;
+        bool unreach;                   // �K�x�R���p�F�����B�t���O
 } Cell;
 
@@ -142 +143 @@
 
 private:
-        void collect_garbage();
+        void clear_all_mark();                                                  ///< ���ׂẴZ���𖢓��B�ɐݒ� void mark_cell(SExp sexp);                                              ///< �Z���Ƀ}�[�N������ċA�j
+        void collect_garbage();                                                 ///< �K�x�[�W�R���N�V����
 
         SExp read_string(FILE* fp);
@@ -251 +253 @@
         g_builtin_p = 0;
 
+        clear_all_mark();
                 // �Z������‚Ȃ��āA�t���[�Z���Ƃ���        for (int i=0; i<MAX_CELL-1; ++i) {
                 Cell* p = &g_cell_buf[i];
@@ -298 +301 @@
 }
 
+void MLContext::clear_all_mark()
+{
+        for (int i=0; i<MAX_CELL; ++i) {
+                Cell* p = &g_cell_buf[i];
+                p->unreach = true;
+        }
+}
+
+void MLContext::mark_cell(SExp sexp)
+{
+        int type = SEXP_TYPE(sexp);
+        if (type == tCell || type == tFunc) {
+                Cell* p = get_cell_ptr(sexp);
+                if (p->unreach) {
+                        p->unreach = false;
+                        mark_cell(p->car);
+                        mark_cell(p->cdr);
+                }
+        }
+}
+
 void MLContext::collect_garbage()
 {
-        assert(!"not implemented");
+        assert(!"���r���I");
+
+        clear_all_mark();
+
+                // �‹����炽�ǂ��Z���Ƀ}�[�N�����           // �O���[�o��
+        for (int i=0; i<g_symbol_free_p; ++i) {
+                Symbol* p = &g_symbol_buf[i];
+                mark_cell(p->sexp);
+        }
+                // �X�^�b�N
+        for (int i=0; i<g_stack_p; ++i) {
+                SExp sexp = g_stack[i];
+                mark_cell(sexp);
+        }
+
+                // �}�[�N�̂‚��ĂȂ��Z�����Exp free = cNil;
+        for (int i=0; i<MAX_CELL; ++i) {
+                Cell* p = &g_cell_buf[i];
+                if (p->unreach) {
+                        SExp t = MAKE_SEXP(tCell, i);
+                        Cell* p = get_cell_ptr(t);
+                        p->cdr = free;
+                        free = t;
+                        ++free_cell_num;
+                }
+        }
+        g_free_cell = free;
 }
 
@@ -317 +367 @@
 
         Cell* p = &g_cell_buf[idx];
+        assert(p->unreach);
         p->car = a;
         p->cdr = d;
+        p->unreach = false;
 
         return MAKE_SEXP(tCell, idx);