improved the barrel shifter

src/main/dig/generic/barrelShifter/Test.dig

@@ -371,12 +371,100 @@ end loop</dataString>
       </elementAttributes>
       <pos x="580" y="1020"/>
     </visualElement>
+    <visualElement>
+      <elementName>Out</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>D^64</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>64</int>
+        </entry>
+        <entry>
+          <string>intFormat</string>
+          <intFormat>bin</intFormat>
+        </entry>
+      </elementAttributes>
+      <pos x="740" y="-120"/>
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>D^64_in</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>64</int>
+        </entry>
+        <entry>
+          <string>intFormat</string>
+          <intFormat>bin</intFormat>
+        </entry>
+        <entry>
+          <string>InDefault</string>
+          <value v="1" z="false"/>
+        </entry>
+      </elementAttributes>
+      <pos x="160" y="-140"/>
+    </visualElement>
+    <visualElement>
+      <elementName>In</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>sh^64</string>
+        </entry>
+        <entry>
+          <string>Bits</string>
+          <int>6</int>
+        </entry>
+      </elementAttributes>
+      <pos x="380" y="-100"/>
+    </visualElement>
+    <visualElement>
+      <elementName>barrelShifter.dig</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>64 bit, left</string>
+        </entry>
+        <entry>
+          <string>generic</string>
+          <string>dataBits := 64;
+direction := &quot;left&quot;;</string>
+        </entry>
+      </elementAttributes>
+      <pos x="420" y="-140"/>
+    </visualElement>
+    <visualElement>
+      <elementName>Testcase</elementName>
+      <elementAttributes>
+        <entry>
+          <string>Label</string>
+          <string>64 bit, left</string>
+        </entry>
+        <entry>
+          <string>Testdata</string>
+          <testData>
+            <dataString>D^64_in sh^64 D^64
+loop(n,64) 
+   1     (n)  (1&lt;&lt;n)
+end loop
+
+loop(n,64) 
+   7     (n)  (7&lt;&lt;n)
+end loop</dataString>
+          </testData>
+        </entry>
+      </elementAttributes>
+      <pos x="580" y="-60"/>
+    </visualElement>
   </visualElements>
   <wires>
-    <wire>
-      <p1 x="160" y="400"/>
-      <p2 x="420" y="400"/>
-    </wire>
     <wire>
       <p1 x="480" y="960"/>
       <p2 x="740" y="960"/>
@@ -386,13 +474,37 @@ end loop</dataString>
       <p2 x="740" y="160"/>
     </wire>
     <wire>
-      <p1 x="380" y="180"/>
+      <p1 x="380" y="-100"/>
-      <p2 x="420" y="180"/>
+      <p2 x="420" y="-100"/>
     </wire>
     <wire>
       <p1 x="480" y="420"/>
       <p2 x="740" y="420"/>
     </wire>
+    <wire>
+      <p1 x="480" y="680"/>
+      <p2 x="740" y="680"/>
+    </wire>
+    <wire>
+      <p1 x="160" y="-140"/>
+      <p2 x="420" y="-140"/>
+    </wire>
+    <wire>
+      <p1 x="160" y="140"/>
+      <p2 x="420" y="140"/>
+    </wire>
+    <wire>
+      <p1 x="160" y="940"/>
+      <p2 x="420" y="940"/>
+    </wire>
+    <wire>
+      <p1 x="160" y="400"/>
+      <p2 x="420" y="400"/>
+    </wire>
+    <wire>
+      <p1 x="380" y="180"/>
+      <p2 x="420" y="180"/>
+    </wire>
     <wire>
       <p1 x="160" y="660"/>
       <p2 x="420" y="660"/>
@@ -401,26 +513,18 @@ end loop</dataString>
       <p1 x="380" y="980"/>
       <p2 x="420" y="980"/>
     </wire>
+    <wire>
+      <p1 x="480" y="-120"/>
+      <p2 x="740" y="-120"/>
+    </wire>
     <wire>
       <p1 x="380" y="440"/>
       <p2 x="420" y="440"/>
     </wire>
-    <wire>
-      <p1 x="480" y="680"/>
-      <p2 x="740" y="680"/>
-    </wire>
-    <wire>
-      <p1 x="160" y="140"/>
-      <p2 x="420" y="140"/>
-    </wire>
     <wire>
       <p1 x="380" y="700"/>
       <p2 x="420" y="700"/>
     </wire>
-    <wire>
-      <p1 x="160" y="940"/>
-      <p2 x="420" y="940"/>
-    </wire>
   </wires>
   <measurementOrdering/>
 </circuit>

src/main/dig/generic/barrelShifter/barrelShifter.dig

@@ -30,9 +30,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="500" y="140"/>
@@ -54,9 +52,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="400" y="120"/>
@@ -74,9 +70,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=bitsNeededFor(args.dataBits-1);</string>
-  this.Bits=bitsNeededFor(args.dataBits-1);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="400" y="160"/>

src/main/dig/generic/barrelShifter/shift-fixed-arith-right-inc.dig

@@ -35,9 +35,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="600" y="140"/>
@@ -55,9 +53,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="280" y="120"/>

src/main/dig/generic/barrelShifter/shift-fixed-left-inc.dig

@@ -35,9 +35,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="600" y="140"/>
@@ -55,9 +53,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="300" y="120"/>

src/main/dig/generic/barrelShifter/shift-fixed-right-inc.dig

@@ -35,9 +35,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="600" y="140"/>
@@ -55,9 +53,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="300" y="120"/>

src/main/dig/generic/barrelShifter/shift-inc.dig

@@ -42,9 +42,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="540" y="140"/>
@@ -66,9 +64,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="180" y="100"/>
@@ -86,9 +82,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.shiftBits);</string>
-  this.Bits=int(args.shiftBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="180" y="140"/>

src/test/resources/dig/test/vhdl/barrelShifter/TestLeft32.dig

@@ -67,7 +67,7 @@
         <entry>
           <string>generic</string>
           <string>dataBits := 32;
-dir := &quot;left&quot;;</string>
+direction := &quot;left&quot;;</string>
         </entry>
       </elementAttributes>
       <pos x="420" y="120"/>

src/test/resources/dig/test/vhdl/barrelShifter/TestLeft8.dig

@@ -67,7 +67,7 @@
         <entry>
           <string>generic</string>
           <string>dataBits := 8;
-dir := &quot;left&quot;;</string>
+direction := &quot;left&quot;;</string>
         </entry>
       </elementAttributes>
       <pos x="420" y="400"/>

src/test/resources/dig/test/vhdl/barrelShifter/TestRight8.dig

@@ -67,7 +67,7 @@
         <entry>
           <string>generic</string>
           <string>dataBits := 8;
-dir := &quot;right&quot;;</string>
+direction := &quot;right&quot;;</string>
         </entry>
       </elementAttributes>
       <pos x="420" y="660"/>

src/test/resources/dig/test/vhdl/barrelShifter/TestRightArith16.dig

@@ -67,7 +67,7 @@
         <entry>
           <string>generic</string>
           <string>dataBits := 16;
-dir := &quot;arith&quot;;</string>
+direction := &quot;arith&quot;;</string>
         </entry>
       </elementAttributes>
       <pos x="420" y="940"/>

src/test/resources/dig/test/vhdl/barrelShifter/barrelShifter.dig

@@ -30,9 +30,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="500" y="140"/>
@@ -54,9 +52,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="400" y="120"/>
@@ -74,9 +70,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=bitsNeededFor(args.dataBits-1);</string>
-  this.Bits=bitsNeededFor(args.dataBits-1);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="400" y="160"/>
@@ -86,13 +80,28 @@
       <elementAttributes>
         <entry>
           <string>generic</string>
-          <string>dataBits:=16;
+          <string>if (isPresent(args)) {
-shiftBits:=int(4);
+
-dir:=&quot;left&quot;;
+    if (args.direction=&quot;right&quot;) {
-if (isPresent(args)) {
+        export circuit:=&quot;shift-fixed-right-inc.dig&quot;;
-  dir=args.dir;
+    } else {
-  dataBits=args.dataBits;
+        if (args.direction=&quot;arith&quot;) {
-  shiftBits=bitsNeededFor(args.dataBits-1);
+            export circuit:=&quot;shift-fixed-arith-right-inc.dig&quot;;
+        } else {
+            if (args.direction=&quot;left&quot;) {
+                export circuit:=&quot;shift-fixed-left-inc.dig&quot;;
+            } else {
+                panic(&quot;only \&quot;left\&quot;, \&quot;right\&quot; or \&quot;arith\&quot; is allowed as direction, not \&quot;&quot;+args.dir+&quot;\&quot;!&quot;);
+            }
+        }
+    }
+
+    export shiftBits:=bitsNeededFor(args.dataBits-1);
+} else {
+    // used if circuit is started as the main circuit
+    export circuit:=&quot;shift-fixed-left-inc.dig&quot;;
+    export dataBits:=16;
+    export shiftBits:=int(4);
 }</string>
         </entry>
       </elementAttributes>

src/test/resources/dig/test/vhdl/barrelShifter/shift-fixed-arith-right-inc.dig

@@ -35,9 +35,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="600" y="140"/>
@@ -55,9 +53,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="280" y="120"/>

src/test/resources/dig/test/vhdl/barrelShifter/shift-fixed-left-inc.dig

@@ -35,9 +35,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="600" y="140"/>
@@ -55,9 +53,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="300" y="120"/>

src/test/resources/dig/test/vhdl/barrelShifter/shift-fixed-right-inc.dig

@@ -35,9 +35,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="600" y="140"/>
@@ -55,9 +53,7 @@
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="300" y="120"/>

src/test/resources/dig/test/vhdl/barrelShifter/shift-inc.dig

@@ -13,22 +13,13 @@
       <elementAttributes>
         <entry>
           <string>generic</string>
-          <string>dataBits:=16;
+          <string>if (isPresent(args)) {
-shift:=8;
+    export shift := 1&lt;&lt;(args.shiftBits-1);
-if (isPresent(args)) {
+    setCircuit(args.circuit);
-    dataBits = args.dataBits;
+} else {
-    shift = 1&lt;&lt;(args.shiftBits-1);
+    // used if circuit is started as the main circuit
-    if (args.dir=&quot;right&quot;) {
+    export dataBits:=16;
-        setCircuit(&quot;shift-fixed-right-inc.dig&quot;);
+    export shift:=8;
-    } else {
-        if (args.dir=&quot;arith&quot;) {
-            setCircuit(&quot;shift-fixed-arith-right-inc.dig&quot;);
-        } else {
-            if (args.dir!=&quot;left&quot;) {
-                panic(&quot;only \&quot;left\&quot;, \&quot;right\&quot; or \&quot;arith\&quot; is allowed as direction, not \&quot;&quot;+args.dir+&quot;\&quot;!&quot;);
-            }
-        }
-    }
 }</string>
         </entry>
       </elementAttributes>
@@ -51,9 +42,7 @@ if (isPresent(args)) {
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="540" y="140"/>
@@ -75,9 +64,7 @@ if (isPresent(args)) {
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.dataBits);</string>
-  this.Bits=int(args.dataBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="180" y="100"/>
@@ -95,9 +82,7 @@ if (isPresent(args)) {
         </entry>
         <entry>
           <string>generic</string>
-          <string>if (isPresent(args)) {
+          <string>this.Bits=int(args.shiftBits);</string>
-  this.Bits=int(args.shiftBits);
-}</string>
         </entry>
       </elementAttributes>
       <pos x="180" y="140"/>
@@ -107,31 +92,18 @@ if (isPresent(args)) {
       <elementAttributes>
         <entry>
           <string>generic</string>
-          <string>dataBits:=16;
+          <string>if (isPresent(args)) {
-shiftBits:=3;
+    if (args.shiftBits=2) {
-dir:=&quot;left&quot;;
+       export shift := 1;
-if (isPresent(args)) {
+       setCircuit(args.circuit);
-  dataBits = args.dataBits;
-  shiftBits = args.shiftBits-1;
-  dir=args.dir;
-  if (args.shiftBits=2) {
-
-    export shift := 1;
-    if (args.dir=&quot;right&quot;) {
-        setCircuit(&quot;shift-fixed-right-inc.dig&quot;);
     } else {
-        if (args.dir=&quot;arith&quot;) {
+        export shiftBits := args.shiftBits-1;
-            setCircuit(&quot;shift-fixed-arith-right-inc.dig&quot;);
-        } else {
-            if (args.dir!=&quot;left&quot;) {
-                panic(&quot;only \&quot;left\&quot;, \&quot;right\&quot; or \&quot;arith\&quot; is allowed as direction, not \&quot;&quot;+args.dir+&quot;\&quot;!&quot;);
-            }
-            setCircuit(&quot;shift-fixed-left-inc.dig&quot;);
-        }
     }
-
+} else {
-
+    // used if circuit is started as the main circuit
-  }
+    export dataBits:=16;
+    export shiftBits:=3;
+    export circuit:=&quot;shift-fixed-left-inc.dig&quot;;
 }</string>
         </entry>
       </elementAttributes>