Changeset 84 for trunk/orca/context.c

Timestamp:

03/09/06 01:20:06 (3 years ago)

Author:

volker

Message:

remove-each with block gc-hardened (but gc-effects not tested)

Files:

• trunk/orca/context.c (modified) (5 diffs)

trunk/orca/context.c

@@ -1237 +1237 @@
     // is so slow).
 
-    orRefAvailErr( 4 )
+    orRefAvailErr( 5 ) // 4 + block-temp
 
     // Must hold body & a2 in case orMakeContext() or orCopyBlock() trigger
@@ -1303 +1303 @@
         case OT_PATH:
         {
+          OIndex keeptBlkIndex;
+          OBlock* keeptBlock;
+          OValue *keept;
+
             blk = orBlockPtr( serN );
-            OValue *keept = calloc(blk->used,sizeof(OValue));
+            keeptBlock = orMakeBlock( blk->used );
+            keeptBlkIndex = orBlockN( keeptBlock );
+            orRefPush( OT_BLOCK, keeptBlkIndex );
+            keept = keeptBlock->values; 
             send = blk->used;
 
@@ -1319 +1326 @@
                 blk = orBlockPtr( serN );          // Reacquire.
                 send = blk->used;
+                keeptBlock =  orBlockPtr( keeptBlkIndex );
+                keept = keeptBlock->values; 
 
                 if( !orIfTrue(orRESULT)){
                   memCpy( keept + sdest, blk->values + si, vlen * sizeof(OValue) );
                   sdest += vlen;
+                  keeptBlock->used = sdest;
                 }
                 si += vlen; 
@@ -1349 +1359 @@
                 blk = orBlockPtr( serN );          // Reacquire.
                 send = blk->used;
+                keeptBlock =  orBlockPtr( keeptBlkIndex );
+                keept = keeptBlock->values; 
+
                 if( !orIfTrue(orRESULT)){
                   memCpy( keept + sdest, blk->values + si, (blk->used - si) * sizeof(OValue) );
                   sdest += blk->used - si;
+                  keeptBlock->used = sdest;
                 }               
             }
@@ -1359 +1373 @@
             orRESULT->series.it = sorig;
             memCpy( blk->values + sorig, keept, sdest * sizeof(OValue));
-            free(keept);
+            orRefPop( 1 ); //free(keept);
         }
         break;