Changeset 106 for trunk/thune/make.c

Timestamp:

03/31/06 22:47:57 (3 years ago)

Author:

krobillard

Message:

Thune - Garbage collector now checks the control stack.

Eliminated quick holds.
Tests now run with GC_STRESS_TEST defined.

Files:

• trunk/thune/make.c (modified) (12 diffs)

trunk/thune/make.c

@@ -55 +55 @@
 
 #ifdef GC_STRESS_TEST
-    if( ur_env->blocks.sweepStart && (ur_env->flags & UR_ENV_GC) )
+    if( ur_env->flags & UR_ENV_GC )
         ur_recycle();
 #endif
@@ -94 +94 @@
 
 #ifdef GC_STRESS_TEST
-    if( ur_env->bin.sweepStart && (ur_env->flags & UR_ENV_GC) )
+    if( ur_env->flags & UR_ENV_GC )
         ur_recycle();
 #endif
@@ -426 +426 @@
 
 
-void ur_makeContext( UContext* ctx, UCell* proto )
+static void ur_makeContext( UContext* ctx, const UCell* proto )
 {
     if( proto && ur_is(proto, UT_BLOCK) )
@@ -435 +435 @@
         UCell* start;
         UCell* end;
+        UIndex hold;
 
         blk = ur_blockPtr( proto->series.n );
@@ -451 +452 @@
         ctx->ctx.wordBlk = ur_makeBlock( size );
 
-        ur_refPush( UT_BLOCK, ctx->ctx.wordBlk );
+        hold = ur_hold( UT_BLOCK, ctx->ctx.wordBlk );
         ctx->ctx.protoValBlk = ur_makeBlock( size );
         ctx->ctx.valBlk = ctx->ctx.protoValBlk;
-        ur_refPop( 1 );
+        ur_release( hold );
 
 
@@ -554 +555 @@
     int argc = 1;
 
-    UR_S_DROP;
-    res = UR_TOS;
+    res = ur_s_prev(tos);
 
     if( ur_is(res, UT_DATATYPE) )
@@ -562 +562 @@
         {
             ur_copy(res, *tos);     // UR_S_NIP;
+            UR_S_DROP;
             return;
         }
@@ -574 +575 @@
 
         argc = 2;
-        UR_S_DROP;
     }
 
@@ -611 +611 @@
                                         str->ptr.c + str->used );
                 }
-                if( ! blkN )
+                else
                 {
                     blkN = ur_makeBlock(0);
                 }
 
-                ur_setType(res, UT_BLOCK);
-                ur_setSeries(res, blkN, 0);
+                if( blkN )
+                {
+                    ur_setType(res, UT_BLOCK);
+                    ur_setSeries(res, blkN, 0);
+                }
             }
             break;
@@ -689 +692 @@
                 ur_bind( tos->series.n, res );
 
-                UR_S_GROW;
-
                 //ur_callControl( UR_CALL_DO );
+                //return UC_DO;
                 UR_CALL_OP = OP_DO;
-                //return UC_DO;
+                return;
             }
             //else if( ur_is(res, UT_CONTEXT) )
@@ -701 +703 @@
 
         case UT_BITSET:
+        {
+            // Make bitset before setting res in case GC is called.
+            UIndex binN = ur_makeBitset(tos);
             ur_setType(res, UT_BITSET);
-            ur_setSeries(res, ur_makeBitset(tos), 0);
+            ur_setSeries(res, binN, 0);
+        }
             break;
 
@@ -708 +714 @@
             goto error;
     }
+
+    UR_S_DROPN( argc );
     return;
     //return UC_CONT;