Changeset 301 for trunk/thune/gc.c

Timestamp:

10/23/06 04:19:31 (2 years ago)

Author:

krobillard

Message:

Thune - Added UBuffer & shader! datatype.

Files:

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

trunk/thune/gc.c

@@ -145 +145 @@
 
 
+static void _freeBuffer( UrlanEnv* env, UGCArray* agc, UBuffer* buf )
+{
+    int idx = ((int) buf->dataType) - UT_BI_COUNT;
+    if( idx >= 0 )
+        env->customDT[ idx ].gcDestroyBuffer( buf );
+
+    // Flag as unused.
+    buf->dataType = UT_UNSET;
+
+    // Link to free list.
+    buf->link = agc->freeList;
+    agc->freeList = buf - ((UBuffer*) agc->arr.ptr.v);
+
+    agc->freeCount += 1;
+}
+
+
+#define FREE_BUFFER(buf) \
+    btmp = buf; \
+    if( btmp->dataType != UT_UNSET ) \
+        _freeBuffer( env, agc, btmp );
+
+static void _sweepBuffers( UrlanEnv* env, UArray* mark, UGCArray* agc )
+{
+    UBuffer* btmp;
+    UBuffer* ait = (UBuffer*) agc->arr.ptr.v;
+    uint8_t* it  = mark->ptr.b;
+    uint8_t* end = it + mark->used;
+
+
+    // Mark padding bits at end as used.
+    {
+    int padBits = agc->arr.used & 7;
+    if( padBits )
+        end[-1] |= 0xff << padBits;
+    }
+
+    // Check mark bitset for unused elements.
+    while( it != end )
+    {
+        if( *it != 0xff )
+        {
+            int mask = *it;
+
+            if( (mask & 0x0f) != 0x0f )
+            {
+                if( (mask & 0x01) == 0 ) { FREE_BUFFER( ait ) }
+                if( (mask & 0x02) == 0 ) { FREE_BUFFER( ait + 1 ) }
+                if( (mask & 0x04) == 0 ) { FREE_BUFFER( ait + 2 ) }
+                if( (mask & 0x08) == 0 ) { FREE_BUFFER( ait + 3 ) }
+            }
+
+            if( (mask & 0xf0) != 0xf0 )
+            {
+                if( (mask & 0x10) == 0 ) { FREE_BUFFER( ait + 4 ) }
+                if( (mask & 0x20) == 0 ) { FREE_BUFFER( ait + 5 ) }
+                if( (mask & 0x40) == 0 ) { FREE_BUFFER( ait + 6 ) }
+                if( (mask & 0x80) == 0 ) { FREE_BUFFER( ait + 7 ) }
+            }
+        }
+        ++it;
+        ait += 8;
+    }
+}
+
 
 static UCollector _gc;
-
-#define bsBlk       _gc.bsBlock
-#define bsStr       _gc.bsBin
 
 
@@ -156 +218 @@
 #define SET_BIT_BLOCK(bn) \
     idx = bn - env->blocks.sweepStart; \
-    if( idx >= 0 ) ur_setBit( bsBlk.ptr.b, idx );
+    if( idx >= 0 ) ur_setBit( _gc.bsBlock.ptr.b, idx );
 
 #define SET_BIT_BIN(bn) \
     idx = bn - env->bin.sweepStart; \
-    if( idx >= 0 ) ur_setBit( bsStr.ptr.b, idx );
+    if( idx >= 0 ) ur_setBit( _gc.bsBin.ptr.b, idx );
 
 #define SWEEP_START_BLOCK   env->blocks.sweepStart
@@ -168 +230 @@
 
 #define SET_BIT_BLOCK(bn) \
-    idx = bn; ur_setBit( bsBlk.ptr.b, idx );
+    idx = bn; ur_setBit( _gc.bsBlock.ptr.b, idx );
 
 #define SET_BIT_BIN(bn) \
-    idx = bn; ur_setBit( bsStr.ptr.b, idx );
+    idx = bn; ur_setBit( _gc.bsBin.ptr.b, idx );
 
 #define SWEEP_START_BLOCK   0
@@ -188 +250 @@
 {
     ur_setBit( gc->bsBlock.ptr.b, idx );
+}
+
+
+void ur_gcMarkBuffer( UCollector* gc, UIndex idx )
+{
+    ur_setBit( gc->bsBuf.ptr.b, idx );
 }
 
@@ -261 +329 @@
                     int ai   = idx >> 3;
                     int bitm = 1 << (idx & 7);
-                    bsBlk.ptr.b[ ai ] |= bitm;
+                    _gc.bsBlock.ptr.b[ ai ] |= bitm;
                     _gc.blkChecked.ptr.b[ ai ] |= bitm;
                 }
@@ -273 +341 @@
                 idx = it->func.closureN;
                 if( idx )
-                    ur_setBit( bsBlk.ptr.b, idx );
+                    ur_setBit( _gc.bsBlock.ptr.b, idx );
 
                 idx = it->func.sigN;
                 if( idx )
-                    ur_setBit( bsBlk.ptr.b, idx );
+                    ur_setBit( _gc.bsBlock.ptr.b, idx );
                 break;
 
@@ -293 +361 @@
                     int ai   = idx >> 3;
                     int bitm = 1 << (idx & 7);
-                    bsBlk.ptr.b[ ai ] |= bitm;
+                    _gc.bsBlock.ptr.b[ ai ] |= bitm;
                     if( ! (_gc.blkChecked.ptr.b[ ai ] & bitm) )
                     {
@@ -319 +387 @@
                 idx = it->err.messageStr;
                 if( idx )
-                    ur_setBit( bsStr.ptr.b, idx );
+                    ur_setBit( _gc.bsBin.ptr.b, idx );
 
                 idx = it->err.traceBlk;
                 if( idx )
-                    ur_setBit( bsBlk.ptr.b, idx );
+                    ur_setBit( _gc.bsBlock.ptr.b, idx );
                 break;
 
@@ -399 +467 @@
                 idx = it->func.sigN;
                 if( idx )
-                    ur_setBit( bsBlk.ptr.b, idx );
+                    ur_setBit( _gc.bsBlock.ptr.b, idx );
                 it -= CC_LEN_FUNC;
                 break;
@@ -548 +616 @@
     GC_BITSET( _gc.blkChecked, env->blocks, SWEEP_START_BLOCK );
 
-    GC_BITSET( bsBlk, env->blocks,      SWEEP_START_BLOCK );
-    GC_BITSET( bsStr, env->bin,         SWEEP_START_BIN );
+    GC_BITSET( _gc.bsBlock, env->blocks,    SWEEP_START_BLOCK );
+    GC_BITSET( _gc.bsBin,   env->bin,       SWEEP_START_BIN );
+    GC_BITSET( _gc.bsBuf,   env->buffers,   0 );
 
 #ifdef PAIRPOOL_H
@@ -585 +654 @@
     ur_setBit( doneset, GLOBAL_WORD_BLKN );
 
-    ur_setBit( bsBlk.ptr.b, GLOBAL_VAL_BLKN );
-    ur_setBit( bsBlk.ptr.b, GLOBAL_WORD_BLKN );
-
-
-    ur_setBit( bsStr.ptr.b, BIN_ATOM_NAMES );
+    ur_setBit( _gc.bsBlock.ptr.b, GLOBAL_VAL_BLKN );
+    ur_setBit( _gc.bsBlock.ptr.b, GLOBAL_WORD_BLKN );
+
+
+    ur_setBit( _gc.bsBin.ptr.b, BIN_ATOM_NAMES );
 
 
@@ -627 +696 @@
 
         i = 0;
-        markset = bsBlk.ptr.b;
+        markset = _gc.bsBlock.ptr.b;
         doneset = _gc.blkChecked.ptr.b;
 
@@ -674 +743 @@
 #endif
 
-    _sweepArray( &bsBlk, &env->blocks );
-    _sweepArray( &bsStr, &env->bin );
+    _sweepBuffers( env, &_gc.bsBuf, &env->buffers );
+    _sweepArray( &_gc.bsBlock, &env->blocks );
+    _sweepArray( &_gc.bsBin,   &env->bin );
 
     ur_arrayFree( &_gc.blkChecked );
 
-    ur_arrayFree( &bsBlk );
-    ur_arrayFree( &bsStr );
+    ur_arrayFree( &_gc.bsBuf );
+    ur_arrayFree( &_gc.bsBlock );
+    ur_arrayFree( &_gc.bsBin );
 
 #ifdef GC_TIME