HDLRuby 2.4.14 → 2.4.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 624b9738e43e9de0207b36e50f26dfc0885d260f004cec10d4bf27c5dc9a3c33
-  data.tar.gz: 6599a6daacaf1699d39b14bcb51fe3c93367b57fb29e0dbac089d609b63673b5
+  metadata.gz: 80660af24803dfe38c615c2172d6cf243c6eda9968477d085d804eaa1f57f88e
+  data.tar.gz: ce672bdc08f5413d87e0a3ce4c83316f68560e3bdc270cf306474a63ef9d1dbc
 SHA512:
-  metadata.gz: b134540ea1182bf20b0c38e771161b3882c3d27128c8343bf6a0cf487f1f0e631ff6491d6abf9df9e6e89a09e6005af6ceb95f24ce54e0043c2195872e875197
-  data.tar.gz: edc4a191153cf71fe399b2756a50fb2b447c4571e0596b740de4c138d7bcf1314bc243614eb66e0a18d65e5642d27ab72bae0f60753bf223dfaea1a71935d211
+  metadata.gz: d9526ced19d1faa8155c42a4279f2813b3682fc19a17b0e0956950ee554c2173959d0d8c08e4e98fa2fa3b1b6270645f30aef4baa3ebc48e8b5bd10028013f3f
+  data.tar.gz: 70320cd784ea0928f2ced5a747229af97121387bfbd92db64b9e663b6e8ed743f6e96b519fd24dc02828cca7a8a384ffde90d64985b40384469e96558abec13f

data/lib/HDLRuby/hdr_samples/with_connector.rb

@@ -125,20 +125,26 @@ end
 # Module for testing the connector.
 system :with_connectors do
     inner :clk, :rst
-    [4].inner :counter, :res_0,:res_1,:res_2,:res_3
+    [4].inner :counter #, :res_0,:res_1,:res_2,:res_3
+    [4*4].inner :res
     inner :ack_in, :ack_out
 
     # The input queue.
     queue(bit[4],4,clk,rst).(:in_qu)
 
-    # The first output queue.
-    queue(bit[4],4,clk,rst).(:out_qu0)
-    queue(bit[4],4,clk,rst).(:out_qu1)
-    queue(bit[4],4,clk,rst).(:out_qu2)
-    queue(bit[4],4,clk,rst).(:out_qu3)
+    # The middle queues.
+    mid_qus = 4.times.map do |i|
+        queue(bit[4],4,clk,rst).(:"mid_qu#{i}")
+    end
+
+    # The output queue.
+    queue(bit[4*4],4,clk,rst).(:out_qu)
+
+    # Connect the input queue to the middle queues.
+    duplicator(bit[4],clk.negedge,in_qu,mid_qus)
 
-    # Connect them
-    duplicator([4],clk.negedge,in_qu,[out_qu0,out_qu1,out_qu2,out_qu3])
+    # Connect the middle queues to the output queue.
+    merger([bit[4]]*4,clk.negedge,mid_qus,out_qu)
 
     # # Slow version, always work
     # par(clk.posedge) do
@@ -154,10 +160,10 @@ system :with_connectors do
     #             end
     #         end
     #         hif(ack_in) do
-    #             out_qu0.read(res_0)
-    #             out_qu1.read(res_1)
-    #             out_qu2.read(res_2)
-    #             out_qu3.read(res_3) { ack_out <= 1 }
+    #             mid_qu0.read(res_0)
+    #             mid_qu1.read(res_1)
+    #             mid_qu2.read(res_2)
+    #             mid_qu3.read(res_3) { ack_out <= 1 }
     #         end
     #     end
     # end
@@ -172,10 +178,11 @@ system :with_connectors do
                 counter <= counter + 1
             end
             hif(ack_in) do
-                out_qu0.read(res_0)
-                out_qu1.read(res_1)
-                out_qu2.read(res_2)
-                out_qu3.read(res_3)
+                # mid_qu0.read(res_0)
+                # mid_qu1.read(res_1)
+                # mid_qu2.read(res_2)
+                # mid_qu3.read(res_3)
+                out_qu.read(res)
             end
         end
     end

data/lib/HDLRuby/sim/hruby_sim_calc.c

@@ -1223,6 +1223,8 @@ static Value concat_value_bitstring_array(int num, int dir,
     }
     /* Resize the destination accordignly. */
     resize_value(dst,width);
+    /* Ensure it is not numeric. */
+    dst->numeric = 0;
 
     /* Access the data of the destination. */
     char* dst_data = dst->data_str;
@@ -1233,7 +1235,7 @@ static Value concat_value_bitstring_array(int num, int dir,
         unsigned int idx = dir ? (num-i-1) : i;
         Value value = args[idx];
         unsigned long long cw = type_width(value->type);
-        // printf("value=%s cw=%llu\n",value->data_str,cw);
+        // printf("value=%s cw=%llu pos=%llu\n",value->data_str,cw,pos);
         memcpy(dst_data+pos,value->data_str,cw);
         pos += cw;
     }

data/lib/HDLRuby/std/connector.rb

@@ -6,34 +6,59 @@ module HDLRuby::High::Std
 ########################################################################
 
     # Function for generating a connector that duplicates the output of
-    # channel +inch+ and connect it to channels +outchs+ with data of
+    # channel +in_ch+ and connect it to channels +out_chs+ with data of
     # +typ+.
     # The duplication is done according to event +ev+.
-    function :duplicator do |typ, ev, inch, outchs|
+    function :duplicator do |typ, ev, in_ch, out_chs|
         ev = ev.poswedge unless ev.is_a?(Event)
         inner :in_ack, :in_req
-        out_chacks = outchs.map.with_index do |ch,i|
-            [ ch, inner(:"out_ack#{i}") ]
-        end
+        out_acks = out_chs.size.times.map { |i| inner(:"out_ack#{i}") }
         typ.inner :data
         par(ev) do
             in_req <= 1
-            out_chacks.each { |ch,ack| ack <= 0 }
-            out_chacks.each do |ch,ack| 
+            out_acks.each { |ack| ack <= 0 }
+            out_acks.each do |ack| 
                 hif(ack == 1) { in_req <= 0 }
             end
             hif(in_req) do
                 in_ack <= 0
-                inch.read(data) { in_ack <= 1 }
+                in_ch.read(data) { in_ack <= 1 }
             end
             hif(in_ack) do
-                out_chacks.each do |ch,ack|
+                out_chs.zip(out_acks).each do |ch,ack|
                     hif(ack == 0) { ch.write(data) { ack <= 1 } }
                 end
-                hif (out_chacks.reduce(_1) { |sum,(ch,ack)| ack & sum }) do
-                    out_chacks.each { |ch,ack| ack <= 0 }
+                hif (out_acks.reduce(_1) { |sum,ack| ack & sum }) do
+                    out_acks.each { |ack| ack <= 0 }
+                end
+            end
+        end
+    end
+
+    # Function for generating a connector that merges the output of
+    # channels +in_chs+ and connects the result to channel +out_ch+ with
+    # data of +typ+.
+    # The merge is done according to event +ev+.
+    function :merger do |typs, ev, in_chs, out_ch|
+        ev = ev.posedge unless ev.is_a?(Event)
+        inner :out_ack
+        in_reqs = in_chs.size.times.map { |i| inner(:"in_req#{i}") }
+        in_acks = in_chs.size.times.map { |i| inner(:"in_ack#{i}") }
+        datas =   typs.map.with_index { |typ,i| typ.inner(:"data#{i}") }
+        par(ev) do
+            in_reqs.each { |req| req <= 1 }
+            out_ack <= 0
+            hif(out_ack == 1) { in_reqs.each { |req| req <= 0 } }
+            hif(in_reqs.reduce(_1) { |sum,req| req & sum }) do
+                in_chs.each_with_index do |ch,i|
+                    in_acks[i] <= 0
+                    ch.read(datas[i]) { in_acks[i] <= 1 }
                 end
             end
+            hif(in_acks.reduce(_1) { |sum,req| req & sum }) do
+                hif(out_ack == 0) { out_ch.write(datas) { out_ack <= 1 } }
+                hif (out_ack == 1) { out_ack <= 0 }
+            end
         end
     end
 

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.4.14"
+  VERSION = "2.4.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.4.14
+  version: 2.4.15
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler