Changeset 117 for trunk/thune/gc.c

Timestamp:

04/18/06 13:22:12 (3 years ago)

Author:

krobillard

Message:

Thune - Added code! datatype, ULanguage, and UCollector.

GC now marks word.wordBlk.

Files:

• trunk/thune/gc.c (modified) (10 diffs)

trunk/thune/gc.c

@@ -145 +145 @@
 
 
-static UBinary bsBlk;
-static UBinary bsStr;
-static UBinary blkChecked;
+static UCollector _gc;
+
+#define bsBlk       _gc.bsBlock
+#define bsStr       _gc.bsBin
 
 #ifdef OR_CONFIG_NUMBER_ARRAYS
@@ -180 +181 @@
 
 #endif
+
+
+void ur_gcMarkBin( UCollector* gc, UIndex idx )
+{
+    ur_setBit( gc->bsBin.ptr.b, idx );
+}
+
+
+void ur_gcMarkBlock( UCollector* gc, UIndex idx )
+{
+    ur_setBit( gc->bsBlock.ptr.b, idx );
+}
 
 
@@ -204 +217 @@
             case UT_SETWORD:
             //case UT_LITWORD:      // Only atom is used in lit-words?
+                SET_BIT_BLOCK( it->word.wordBlk );
                 SET_BIT_BLOCK( it->word.valBlk );
                 break;
@@ -245 +259 @@
                     int bitm = 1 << (idx & 7);
                     bsBlk.ptr.b[ ai ] |= bitm;
-                    blkChecked.ptr.b[ ai ] |= bitm;
+                    _gc.blkChecked.ptr.b[ ai ] |= bitm;
                 }
 
@@ -277 +291 @@
                     int bitm = 1 << (idx & 7);
                     bsBlk.ptr.b[ ai ] |= bitm;
-                    if( ! (blkChecked.ptr.b[ ai ] & bitm) )
+                    if( ! (_gc.blkChecked.ptr.b[ ai ] & bitm) )
                     {
-                        blkChecked.ptr.b[ ai ] |= bitm;
+                        _gc.blkChecked.ptr.b[ ai ] |= bitm;
                         _checkBlock( ur_block( it ) );
                     }
@@ -299 +313 @@
                 if( idx )
                     ur_setBit( bsBlk.ptr.b, idx );
+                break;
+
+            case UT_CODE:
+            {
+                ur_language( it )->codeGC( &_gc, it );
+            }
                 break;
         }
@@ -467 +487 @@
 #endif
 
-    GC_BITSET( blkChecked, ur_env->blocks, SWEEP_START_BLOCK );
+    GC_BITSET( _gc.blkChecked, ur_env->blocks, SWEEP_START_BLOCK );
 
     GC_BITSET( bsBlk, ur_env->blocks,      SWEEP_START_BLOCK );
@@ -491 +511 @@
     _checkBlock( blk + GLOBAL_VAL_BLKN );
 
-    doneset = blkChecked.ptr.b;
+    doneset = _gc.blkChecked.ptr.b;
     ur_setBit( doneset, GLOBAL_VAL_BLKN );
     ur_setBit( doneset, GLOBAL_WORD_BLKN );
@@ -528 +548 @@
         i = 0;
         markset = bsBlk.ptr.b;
-        doneset = blkChecked.ptr.b;
+        doneset = _gc.blkChecked.ptr.b;
 
         bit  = blk + SWEEP_START_BLOCK;
@@ -570 +590 @@
 #endif
 
-    ur_arrayFree( &blkChecked );
+    ur_arrayFree( &_gc.blkChecked );
 
     ur_arrayFree( &bsBlk );