Changeset 509 for trunk/thune/gc.c

Timestamp:

02/09/08 02:35:22 (10 months ago)

Author:

krobillard

Message:

Added hold/release macros. ur_readDir() now holds its result block.

Files:

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

trunk/thune/gc.c

@@ -231 +231 @@
 
 
+static void _checkCells( UThread* ut, UCollector* gc, UCell* it, UCell* end );
+
 static void _checkBlock( UThread* ut, UCollector* gc, UBlock* blk )
 {
-    int idx;
     UCell* it  = blk->ptr.cells;
-    UCell* end = it + blk->used;
 
 #ifdef GC_VERBOSE
@@ -241 +241 @@
 #endif
 
-    if( ! it )
-        return;
-
+    if( it )
+        _checkCells( ut, gc, it, it + blk->used );
+}
+
+
+static void _checkCells( UThread* ut, UCollector* gc, UCell* it, UCell* end )
+{
+    int idx;
     while( it != end )
     {
@@ -396 +401 @@
             case CC_ITER:
             case CC_EACH:
+            {
+                UCell* cell = ((UCell*) it) - 1;
                 SET_BIT_BLOCK_L( it->cp.n )
+                _checkCells( ut, gc, cell, cell + 1 );
                 it -= CC_LEN_ITER;
+            }
                 break;
 
@@ -422 +431 @@
 static void _checkControlStack( UThread* ut, UCollector* gc )
 {
-    UBlock blk;
-
-    blk.ptr.cells = UR_BOC;
-    blk.used      = UR_TOC - UR_BOC;
-
-    assert( blk.used > -1 );
-
-    _checkBlock( ut, gc, &blk );
+    assert( UR_TOC >= UR_BOC );
+
+    _checkCells( ut, gc, UR_BOC, UR_TOC );
 }
 #endif
@@ -436 +440 @@
 static void _checkDataStack( UThread* ut, UCollector* gc )
 {
-    UBlock blk;
-
-    blk.ptr.cells = UR_BOS + 1;
-    blk.used      = UR_TOS - UR_BOS;
-
 #ifndef LANG_RUNE
     assert( ur_is(UR_BOS, UT_UNSET) );
 #endif
-    assert( blk.used > -1 );
-
-    _checkBlock( ut, gc, &blk );
+    assert( UR_TOS >= UR_BOS );
+
+    _checkCells( ut, gc, UR_BOS + 1, UR_TOS + 1 );
 }