Changeset 430 for branches/thune

Timestamp:

07/08/07 05:51:41 (17 months ago)

Author:

krobillard

Message:

Component inputs can now be declared /quiet or /strobe

Location:

branches/thune/thread_safe

Files:

• component.c (modified) (7 diffs)
• component.h (modified) (1 diff)
• doc/UserManual (modified) (1 diff)

branches/thune/thread_safe/component.c

@@ -39 +39 @@
     int* counter;
     UAtom atom;
+    uint32_t special = 0;
 
 
@@ -60 +61 @@
                 *counter = *counter + 1;
         }
+        else if( ur_is(it, UT_SELECT) )
+        {
+            if( ur_atom(it) >= UT_BI_COUNT )
+            {
+                if( ur_selIsAtom(it) && (counter == &inC) )
+                {
+                    const char* str = ur_atomCStr( ur_sel(it), 0 );
+                    if( *str == 'q' )
+                        special |= 1 << inC;        // Quiet
+                    else if( *str == 's' )
+                        special |= 0x10000 << inC;  // Strobe
+                }
+                *counter = *counter + 1;
+            }
+        }
         ++it;
     }
@@ -75 +91 @@
     while( it != end )
     {
-        if( ur_is(it, UT_WORD) )
+        if( ur_is(it, UT_WORD) || ur_is(it, UT_SELECT) )
         {
             atom = ur_atom(it);
@@ -94 +110 @@
     ++it;
     ur_initType( it, UT_COORD );    // component-counts
-    it->coord.len = 4;
+    it->coord.len = 6;
     ur_ccIn(it)   = inC;
     ur_ccOut(it)  = outC;
     ur_ccLoc(it)  = localC;
     ur_ccMask(it) = 0xffff << inC;
+    ur_ccSpec(it) = special;
     ++it;
     ur_copyCell( it, *bodCell );    // component-body
@@ -120 +137 @@
 
 
+/*
+   (sig body -- comp)
+*/
 UR_CALL( uc_component )
 {
@@ -398 +418 @@
     UCell* val;
     int trigger;
+    uint32_t mask;
+    uint32_t special;
 
     if( wrdN < COMPONENT_CELLS )
@@ -412 +434 @@
         ur_copyCell( val, *nval );
 
+        mask = 0x10001 << wrdN;
+        special = ur_ccSpec(plugCnts) & mask;
+
         trigger = ur_ccMask(plugCnts);
         if( trigger != -1 )
         {
-            trigger |= (1 << wrdN);
-            ur_ccMask(plugCnts) = trigger;
+            trigger |= mask;
+
+            if( special < 0x10000 )             // Not Strobe
+                ur_ccMask(plugCnts) = trigger;
+
             if( trigger != -1 )
                 return;
         }
+
+        if( special & 0xffff )                  // Quiet
+            return;
 
         // All inputs are set; add to execute list...

branches/thune/thread_safe/component.h

@@ -14 +14 @@
 
 // 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]
+#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]
+#define ur_ccSpec(cell)     (cell)->dt.mask1
 
 // LIMIT: ur_ccMask limits number of component inputs to 16.
-//        Could use last int32_t of cell to handle 32.
 
 

branches/thune/thread_safe/doc/UserManual

@@ -286 +286 @@
 
     c1 probe connect
+
+
+Quiet Inputs
+~~~~~~~~~~~~
+
+Inputs can be declared with a */quiet* selector to prevent them from
+activating the component when set.
+
+Here is an example component with an enable switch::
+
+    [in enable/quiet -- out] [enable ift (in 2 mul :out)] component :mul2
+
+    false :mul2/enable    ; No activation
+    2 :mul2/in            ; Activation, but no output
+    true  :mul2/enable    ; No activation
+    2 :mul2/in            ; Activation with output
+
+
+Strobe Inputs
+~~~~~~~~~~~~~
+
+A single input can be declared with a */strobe* selector.  This input will
+then control when the component activates.  No other input will cause an
+activation.