Changeset 187 for trunk/thune/gc.c

Timestamp:

06/20/06 05:09:27 (3 years ago)

Author:

krobillard

Message:

Thune - Major improvement to the handling of local function values.
Locals can now be passed to inner functions and caught when returned.
Functions are no longer tied to the thread which created them.

The localArgBlk has been eliminated and locals are now stored on the stack.
To accomodate this, the data stack is now separate from the control stack
and grows upwards. This also means that functions can no longer access the
stack below the function call. A limit of one returned value is in place.

To regain full stack usage, locals could be stored on the control stack.
The only downside would be an extra copy of arguments from the data to
the control stack.

ur_wordCell() is now a function rather than a macro.

uc_do() has been merged into ur_eval() and 'do is now implemented as an opcode.

. & .s now use uc_console_out() rather than dprint.

Files:

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

trunk/thune/gc.c

@@ -206 +206 @@
 #endif
 
-    // Function argument blocks will have blk->used set but no
-    // blk->ptr.cells.
     if( ! it )
         return;
@@ -222 +220 @@
                     SET_BIT_BLOCK( it->word.wordBlk );
                 }
-                SET_BIT_BLOCK( it->word.valBlk );
+                if( it->word.valBlk > 0 )
+                {
+                    SET_BIT_BLOCK( it->word.valBlk );
+                }
                 break;
 
@@ -401 +402 @@
         {
             case CC_FUNC:
-                if( it->func.argc )
-                    it -= it->func.argc;
-                --it;
+                SET_BIT_BLOCK( it->func.bodyN );
+                idx = it->func.sigN;
+                if( idx )
+                    ur_setBit( bsBlk.ptr.b, idx );
+                it -= CC_LEN_FUNC;
                 break;
 
@@ -444 +447 @@
     UBlock blk;
 
-    blk.ptr.cells = UR_TOS;
-    blk.used      = UR_BOS - UR_TOS;
+    blk.ptr.cells = UR_BOS + 1;
+    blk.used      = UR_TOS - UR_BOS;
+
+    assert( ur_is(UR_BOS, UT_UNSET) );
+    assert( blk.used > -1 );
 
     _checkBlock( &blk );