Changeset 428 for branches/thune

Timestamp:

07/07/07 23:25:19 (17 months ago)

Author:

krobillard

Message:

Components can now be copied. Added component test.

Location:

branches/thune/thread_safe

Files:

• component.c (modified) (2 diffs)
• component.h (added)
• internal.h (modified) (1 diff)
• make.c (modified) (2 diffs)
• series.c (modified) (2 diffs)
• tests/working/component.good (added)
• tests/working/component.t (added)

branches/thune/thread_safe/component.c

@@ -20 +20 @@
 
 #include "internal.h"
+#include "component.h"
 #include "urlan_atoms.h"
-
-
-// Component Count Accessors
-#define ur_ccIn(cell)   (cell)->coord.elem[0]
-#define ur_ccOut(cell)  (cell)->coord.elem[1]
-#define ur_ccLoc(cell)  (cell)->coord.elem[2]
-#define ur_ccMask(cell) (cell)->coord.elem[3]
 
 
@@ -124 +118 @@
     return 0; //sigN;
 }
-
-
-/**
-void ur_cloneComponent( UThread* ut, UCell* result, UCell* proto )
-{
-    (void) ut;
-    (void) result;
-    (void) proto;
-}
-*/
 
 

branches/thune/thread_safe/internal.h

@@ -17 +17 @@
 //#define BLK_DSTACK          4
 
-enum ComponentContextValues
-{
-    COMPONENT_SELF = 0,
-    COMPONENT_COUNTS,
-    COMPONENT_BODY,
-    COMPONENT_CELLS
-};
 
 #define initGCArray(af) \

branches/thune/thread_safe/make.c

@@ -29 +29 @@
 
 
+//#define GC_STRESS_TEST  1
+
+
 extern int64_t ur_stringToInt( const char*, const char*, const char** );
 extern int64_t ur_hexToInt( const char*, const char*, const char** );
@@ -34 +37 @@
 
 extern UContext ur_thrGlobal;
-
-
-//#define GC_STRESS_TEST  1
 
 

branches/thune/thread_safe/series.c

@@ -19 +19 @@
 
 
-#include "os.h"
-#include "urlan.h"
+#include "internal.h"
 #include "charset.h"
-#include "internal.h"
 #include "list.h"
+#ifdef UR_CONFIG_DATAFLOW
+#include "component.h"
+#endif
 
 
@@ -2356 +2357 @@
             }
             break;
+
+#ifdef UR_CONFIG_DATAFLOW
+        case UT_COMPONENT:
+        {
+            UBlock* orig;
+            UBlock* blk;
+            UCell* cnt;
+            UCell* it;
+            UCell* end;
+            UIndex blkN;
+            int len;
+
+            orig = ur_blockPtr( val->ctx.valBlk );
+            it   = orig->ptr.cells;
+            len  = orig->used;
+            blkN = ur_makeBlockT( ut, len, &blk );
+
+            ur_copyCells( it, it + len, blk->ptr.cells );
+            blk->used = len;
+
+            // Point result & self to new values.
+            it = blk->ptr.cells + COMPONENT_SELF;
+            val->ctx.valBlk = it->ctx.valBlk = blkN;
+
+            // Initialize input mask.
+            cnt = blk->ptr.cells + COMPONENT_COUNTS;
+            ur_ccMask(cnt) = 0xffff << ur_ccIn(cnt);
+
+            // Initialize plugs to unset.
+            it = blk->ptr.cells + COMPONENT_CELLS;
+            end = it + ur_ccIn(cnt) + ur_ccOut(cnt);
+            while( it != end )
+            {
+                ur_initType( it, UT_UNSET );
+                ++it;
+            }
+
+            // Initialize locals to none.
+            end = it + ur_ccLoc(cnt);
+            while( it != end )
+            {
+                ur_setNone( it );
+                ++it;
+            }
+
+            // Copy & rebind body.
+            it = blk->ptr.cells + COMPONENT_BODY;
+            ur_clone( ut, it, UR_COPY_ALL, 1 );
+            ur_bindT( ut, it->series.n, val, UR_BIND_PLUG );
+        }
+            break;
+#endif
 
         default:    // keep value...