Changeset 142

Timestamp:

05/09/06 22:54:53 (3 years ago)

Author:

krobillard

Message:

Fixed GC issues created by the changes to function argument handling [140].
Also fixed mold and form so they hold their argument from the GC.

Location:

trunk/orca

Files:

• gc.c (modified) (2 diffs)
• ovalue.c (modified) (4 diffs)
• print.c (modified) (2 diffs)

trunk/orca/gc.c

@@ -169 +169 @@
 #endif
 
-    // Function argument blocks will have blk->used set but no blk->values.
     if( ! it )
         return;
@@ -255 +254 @@
                     orSetBit( bsBlk.byteArray, idx );
 
-                idx = it->func.context - orEnv->freeBlocks.sweepStart;
-                if( idx >= 0 )
-                    orSetBit( bsBlk.byteArray, idx );
+                // Must check contents of argument block even if below
+                // sweepStart.
+                idx = it->func.context;
+                if( idx > 0 )
+                {
+                    // During recursion this will waste some time
+                    // rechecking stack values.
+                    checkBlock( orBLOCKS + idx );
+                }
                 break;
 

trunk/orca/ovalue.c

@@ -1561 +1561 @@
 OR_NATIVE( orEitherNative )
 {
-    OValue* blkArg = a1 + 2;;
+    OValue* blkArg = a1 + 2;
     if( a1->type != OT_NONE )
     {
@@ -2970 +2970 @@
         int vi;
 
-        orRefAvailErr( 3 )
-        orRefPush( OT_BLOCK, a1->index );
+        blkN = a1->index;
+
+        orRefAvailErr( 2 )
+        orRefPush( OT_BLOCK, blkN );
+
         rblk = orMakeBlock(0);
-
         nblkN = orBlockN(rblk);
-        blkN = a1->index;
-        blk = orBLOCK( a1 );
+
+        blk = orBlockPtr( blkN );
         used = blk->used;
         vi = a1->series.it;
 
-        orRefPush( OT_BLOCK, blkN );
         orRefPush( OT_BLOCK, nblkN );
 
@@ -3000 +3001 @@
         }
 
-        orRefPop( 3 );
+        orRefPop( 2 );
         orResultBLOCK( nblkN );
     }
@@ -4365 +4366 @@
     orRefPush( OT_BLOCK, ctx.vblkN );
 
+    // Initialize values for GC.
+    it   = vblk->values;
     next = vblk->values + total;
+    while( it != next )
+    {
+        orSetTF( it, OT_NONE );
+        ++it;
+    }
+
     orSetTF( next, OT_UNSET );
     next->RECURSE_COUNT = 0;

trunk/orca/print.c

@@ -1127 +1127 @@
 OR_NATIVE_PUB( orFormNative )
 {
-    OString* str = orMakeString( 0 );
+    OString* str;
+
+    ++orEnv->dataStack.used;
+    str = orMakeString( 0 );
+    --orEnv->dataStack.used;
+
     orForm( str, a1 );
     orResultSTRING( orStringN(str) );
@@ -1139 +1144 @@
 {
 #define REF_MOLD_ONLY    a1+1
-    OString* str = orMakeString( 0 );
+    OString* str;
+
+    ++orEnv->dataStack.used;
+    str = orMakeString( 0 );
+    --orEnv->dataStack.used;
+
     mold( str, a1, 0, orRefineSet(REF_MOLD_ONLY) ? MOLD_NO_BRACES : 0 );
     if( str->used )