HDLRuby 2.4.18 → 2.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84f01afb241f5e5e208e4fc47e12e9f1ae8e63e759181280500c2a591999c28d
-  data.tar.gz: 4ae5e9c2eecc25f26803da8c4b70e0bcfa57e7979759d9a194bb6effd515788d
+  metadata.gz: 4d049304b2681a96575ee9e398827724e0262404e973b8c73f830176ec94dffa
+  data.tar.gz: '0472118ef46e7bff7df577fb19dd66396da8a65bc5f9f442967346f4b640ed80'
 SHA512:
-  metadata.gz: f721bbbbbddd9328444b446a882623428e638cdacc3d09c41a86b7c7e260e662e43df7747f91c7eeb3e498b335495722268869f151cff64aaf0d953385285d6b
-  data.tar.gz: 48e48595def6334b972eec991ae83a44876e30994101dd336a7036608c7da47799eafa7fdfb955e11d6f12f7b9728cafdea5fde1d933d6d3c165ef1ba1cdd375
+  metadata.gz: 291dd1ed58fd73a420fc9681a6a64e3cb96ff6667164a98d85bb164723b83e3e5d285ff65a495f3f5f6705423b7ae879f0577386227483b0bd9b5254782774c6
+  data.tar.gz: a9f88a800878ed07c5e3a56bd0a70e3bd7c329a39e5576a36c044c14535d6104f7906444467d4c1f3a27c518da9fc14364ba5c6e02bdd437c5b0dba12fac4268

data/lib/HDLRuby/hdr_samples/rom.rb

@@ -1,12 +1,14 @@
 
+signed[7..0].typedef(:typ)
+
 # Describes an 8-bit data 4-bit address ROM.
 system :rom4_8 do
     [2..0].input :addr
     [7..0].output :data0,:data1,:data2
 
     bit[7..0][0..7].constant content0: [0,1,2,3,4,5,6,7]
-    bit[7..0][-8].constant content1: [0,1,2,3,4,5,6,7]
-    bit[7..0][-8].constant content2: (8).times.to_a
+    signed[7..0][-8].constant content1: [0,1,2,3,4,5,6,7]
+    typ[-8].constant content2: (8).times.to_a
 
     data0 <= content0[addr]
     data1 <= content1[addr]

data/lib/HDLRuby/hdr_samples/with_connector.rb

@@ -130,6 +130,7 @@ system :with_connectors do
     [4].inner :counter
     [4*4].inner :res
     inner :ack_in, :ack_out
+    inner :dup_req, :dup_ack
 
     # The input queue.
     queue(bit[4],4,clk,rst).(:in_qu)
@@ -143,7 +144,7 @@ system :with_connectors do
     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)
+    duplicator(bit[4],clk.negedge,in_qu,mid_qus,dup_req,dup_ack)
 
     # Connect the middle queues to the output queue.
     merger([bit[4]]*4,clk.negedge,mid_qus,out_qu)
@@ -221,6 +222,7 @@ system :with_connectors do
     timed do
         clk <= 0
         rst <= 0
+        dup_req <= 0
         !10.ns
         clk <= 1
         !10.ns
@@ -235,6 +237,13 @@ system :with_connectors do
         !10.ns
         clk <= 0
         rst <= 0
+        4.times do
+            !10.ns
+            clk <= 1
+            !10.ns
+            clk <= 0
+        end
+        dup_req <= 1
         16.times do
             !10.ns
             clk <= 1

data/lib/HDLRuby/hdr_samples/with_connector_memory.rb

@@ -0,0 +1,102 @@
+require 'std/memory.rb'
+require "std/fixpoint.rb"
+require 'std/channel.rb'
+require 'std/connector.rb'
+
+include HDLRuby::High::Std
+
+system :channel_connector do
+    # データ型の宣言
+    integer_width = 4 # 整数部のビット幅
+    decimal_width = 4 # 実数部のビット幅
+    address_width = 4 # lutのアドレスのビット幅
+    typ = signed[integer_width + decimal_width] # データ型
+    
+    inputs_x = _00010011
+    inputs_h = _10100001
+    columns = [2, 2, 1]
+
+    inner :clk,   # clock
+          :rst,   # reset
+          :req,   # request
+          :fill   # 入力値のメモリへの書き込み
+
+    # inputs_x = quantize(inputs_x, typ, decimal_width)
+    # inputs_h = quantize(inputs_h, typ, decimal_width)
+
+    mem_rom(typ, columns[0], clk, rst, inputs_x, rinc: :rst, winc: :rst).(:rom_inputs_x) # 入力値を格納するrom(x)
+
+    mem_rom(typ, columns[0], clk, rst, inputs_h, rinc: :rst, winc: :rst).(:rom_inputs_h) # 入力値を格納するrom(h)
+
+    mem_dual(typ, columns[0], clk, rst, rinc: :rst, winc: :rst).(:ram_inputs_serializer) #
+
+    mem_dual(typ, columns[0]*2, clk, rst, rinc: :rst, winc: :rst).(:ram_inputs_merger) #
+
+    reader_inputs_x = rom_inputs_x.branch(:rinc) #入力値xの読みだし用branch
+    reader_inputs_h = rom_inputs_h.branch(:rinc) #入力値hの読みだし用branch
+    writer_inputs_serializer = ram_inputs_serializer.branch(:winc) #入力値を合成した値の書き込み用branch
+    writer_inputs_meger = ram_inputs_merger.branch(:winc) #入力値を合成した値の書き込み用branch
+  
+
+    serializer(typ,clk.negedge,[reader_inputs_x,reader_inputs_h],writer_inputs_serializer)
+
+    mem_rom(typ, columns[0], clk, rst, inputs_x, rinc: :rst, winc: :rst).(:rom_inputs_r) # 入力値を格納するrom(x)
+    mem_dual(typ, columns[0], clk, rst, rinc: :rst, winc: :rst).(:ram_duplicator0) #
+    mem_dual(typ, columns[0], clk, rst, rinc: :rst, winc: :rst).(:ram_duplicator1) #
+    reader_inputs_r    = rom_inputs_r.branch(:rinc)
+    writer_duplicator0 = ram_duplicator0.branch(:winc)
+    writer_duplicator1 = ram_duplicator1.branch(:winc)
+
+    duplicator(typ,clk.posedge,reader_inputs_r,[writer_duplicator0, writer_duplicator1])
+
+    timed do
+      # リセット
+      clk <= 0
+      rst <= 0
+      req <= 0
+      fill <= 0
+      !10.ps
+
+      # メモリ読み出し位置の初期化
+      rst <= 1
+      !10.ps
+      clk <= 1
+      !10.ps
+      clk <= 0
+      !10.ps
+      clk <= 1
+      !10.ps
+
+      # パラメータのメモリへの書き込み
+      clk <= 0
+      rst <= 0
+      fill <= 1
+
+      !10.ps
+      10.times do |i|
+        clk <= 1
+        !10.ps
+        clk <= 0
+        !10.ps
+      end
+
+      fill <= 0
+      clk <= 1
+      !10.ps
+
+      # 計算の実行
+      clk <= 0
+      req <= 1
+      !10.ps
+      clk <= 1
+      !10.ps
+      clk <= 0
+      !10.ps
+      30.times do
+        clk <= 1
+        !10.ps
+        clk <= 0
+        !10.ps
+      end
+    end
+end

data/lib/HDLRuby/hdr_samples/with_fixpoint.rb

@@ -61,5 +61,6 @@ system :fix_test do
         !10.ns
         c <= a * b
         !10.ns
+        c <= (a+b) * b
     end
 end

data/lib/HDLRuby/hdrcc.rb

@@ -19,6 +19,7 @@ require 'HDLRuby/hruby_low_with_port'
 require 'HDLRuby/hruby_low_with_var'
 require 'HDLRuby/hruby_low_without_concat'
 require 'HDLRuby/hruby_low_without_connection'
+require 'HDLRuby/hruby_low_casts_without_expression'
 require 'HDLRuby/hruby_low_cleanup'
 
 require 'HDLRuby/hruby_verilog.rb'
@@ -577,6 +578,7 @@ elsif $options[:verilog] then
     # top_system = $top_system
     # Make description compatible with verilog generation.
     $top_system.each_systemT_deep do |systemT|
+        systemT.casts_without_expression!
         systemT.to_upper_space!
         systemT.to_global_systemTs!
         # systemT.break_types!

data/lib/HDLRuby/hruby_low.rb

@@ -1183,6 +1183,11 @@ module HDLRuby::Low
             return false
         end
 
+        # Tells if the type of of vector kind.
+        def vector?
+            return false
+        end
+
         # Gets the bitwidth of the type, by default 0.
         # Bit, signed, unsigned and Float base have a width of 1.
         def width
@@ -1410,7 +1415,7 @@ module HDLRuby::Low
 
             # Sets the delegations
             self.extend Forwardable
-            [ :signed?, :unsigned?, :fixed?, :float?, :leaf?,
+            [ :signed?, :unsigned?, :fixed?, :float?, :leaf?, :vector?,
               :width, :range?, :range, :base?, :base, :types?,
               :get_all_types, :get_type, :each, :each_type, 
               :regular?,
@@ -1466,6 +1471,11 @@ module HDLRuby::Low
         # The base type of the vector
         attr_reader :base
 
+        # Tells if the type of of vector kind.
+        def vector?
+            return true
+        end
+
         # Tells if the type has a base.
         def base?
             return true

data/lib/HDLRuby/hruby_low_casts_without_expression.rb

@@ -0,0 +1,326 @@
+require 'HDLRuby'
+require 'HDLRuby/hruby_tools'
+require 'HDLRuby/hruby_low_mutable'
+require 'HDLRuby/hruby_low_with_bool'
+
+
+module HDLRuby::Low
+
+
+##
+# Replace expressions in cast operators with variables.
+# Use for generating Verilog code generation since bit extension cannot
+# be performed on expression but only on signals. 
+#
+########################################################################
+    
+
+    ## Extends the SystemT class with functionality for extracting 
+    #  expressions from cast.
+    class SystemT
+
+        # Extracts the expressions from the casts.
+        def casts_without_expression!
+            self.scope.casts_without_expression!
+            return self
+        end
+
+    end
+
+
+    ## Extends the Scope class with functionality for extracting 
+    #  expressions from cast.
+    class Scope
+
+        # Extracts the expressions from the casts.
+        def casts_without_expression!
+            # Recurse on the sub scopes.
+            self.each_scope(&:casts_without_expression!)
+
+            # Apply on the connections.
+            self.each_connection(&:casts_without_expression!)
+
+            # Apply on the behaviors.
+            self.each_behavior do |behavior|
+                behavior.block.casts_without_expression!
+            end
+            return self
+        end
+    end
+
+
+    ## Extends the Transmit class with functionality for extracting 
+    #  expressions from cast.
+    class Transmit
+
+        # Extracts the expressions from the casts.
+        def casts_without_expression!
+            # Apply on the left value.
+            self.set_left!(self.left.casts_without_expression)
+            # Apply on the right value.
+            self.set_right!(self.right.casts_without_expression)
+            return self
+        end
+    end
+    
+    ## Extends the If class with functionality for extracting 
+    #  expressions from cast.
+    class If
+
+        # Extracts the expressions from the casts.
+        def casts_without_expression!
+            # Apply on the condition.
+            self.set_condition!(self.condition.casts_without_expression)
+            # Apply on the yes.
+            self.yes.casts_without_expression!
+            # Apply on the noifs.
+            @noifs.map! do |cond,stmnt|
+                [cond.casts_without_expression,stmnt.casts_without_expression!]
+            end
+            # Apply on the no if any.
+            self.no.casts_without_expression! if self.no
+            return self
+        end
+    end
+
+    ## Extends the When class with functionality for extracting 
+    #  expressions from cast.
+    class When
+
+        # Extracts the expressions from the casts.
+        def casts_without_expression!
+            # Apply on the match.
+            self.set_match!(self.match.casts_without_expression)
+            # Apply on the statement.
+            self.statement.casts_without_expression!
+            return self
+        end
+    end
+
+
+    ## Extends the Case class with functionality for extracting 
+    #  expressions from cast.
+    class Case
+
+        # Extracts the expressions from the casts.
+        def casts_without_expression!
+            # No need to apply on the value!
+            # Apply on the value.
+            self.set_value!(self.value.casts_without_expression)
+            # Apply on the whens.
+            self.each_when(&:casts_without_expression!)
+            # Apply on the default if any.
+            self.default.casts_without_expression! if self.default
+            return self
+        end
+    end
+
+
+    ## Extends the TimeWait class with functionality for extracting 
+    #  expressions from cast.
+    class TimeWait
+        # Extracts the expressions from the casts.
+        def casts_without_expression!
+            # Nothing to do.
+            return self
+        end
+    end
+
+    ## Extends the TimeRepeat class with functionality for extracting 
+    #  expressions from cast.
+    class TimeRepeat
+        # Extracts the expressions from the casts.
+        def casts_without_expression!
+            # Simply recurse on the stamtement.
+            self.statement.casts_without_expression!
+            return self
+        end
+    end
+
+
+    ## Extends the Block class with functionality for extracting 
+    #  expressions from cast.
+    class Block
+
+        # Extracts the expressions from the casts.
+        def casts_without_expression!
+            # Apply on each statement.
+            self.each_statement(&:casts_without_expression!)
+            return self
+        end
+    end
+
+
+    ## Extends the Value class with functionality for extracting 
+    #  expressions from cast.
+    class Value
+        # Extracts the expressions from the casts.
+        def casts_without_expression
+            # Simple clones.
+            return self.clone
+        end
+    end
+
+
+    ## Extends the Cast class with functionality for extracting 
+    #  expressions from cast.
+    class Cast
+        # Extracts the expressions from the casts.
+        def casts_without_expression
+            # Recurse on the child.
+            nchild = self.child.casts_without_expression
+            # Process the cast.
+            unless (nchild.is_a?(Ref)) then
+                # Need to extract the child.
+                # Create signal holding the child.
+                stmnt = self.statement
+                if (stmnt.is_a?(Connection)) then
+                    # Specific case of connections: need to build
+                    # a new block.
+                    scop = stmnt.parent
+                    scop.delete_connection!(stmnt)
+                    stmnt = Transmit.new(stmnt.left.clone, stmnt.right.clone)
+                    blk = Block.new(:seq)
+                    scop.add_behavior(Behavior.new(blk))
+                    blk.add_statement(stmnt)
+                else
+                    blk = stmnt.block
+                end
+                name = HDLRuby.uniq_name
+                typ = nchild.type
+                sig = blk.add_inner(SignalI.new(name,typ))
+                # Add a statement assigning the child to the new signal.
+                nref = RefName.new(typ,RefThis.new,name)
+                nstmnt = Transmit.new(nref,nchild)
+                idx = blk.each_statement.find_index(stmnt)
+                blk.insert_statement!(idx,nstmnt)
+                # Replace the child by a reference to the created
+                # signal.
+                nchild = nref.clone
+            end
+            return Cast.new(self.type,nchild)
+        end
+    end
+
+    ## Extends the Unary class with functionality for extracting 
+    #  expressions from cast.
+    class Unary
+
+        # Extracts the expressions from the casts.
+        def casts_without_expression
+            # Recurse on the sub node.
+            return Unary.new(self.type,self.operator,
+                             self.child.casts_without_expression)
+            return self
+        end
+    end
+
+
+    ## Extends the Binary class with functionality for extracting 
+    #  expressions from cast.
+    class Binary
+
+        # Extracts the expressions from the casts.
+        def casts_without_expression
+            # Recurse on the sub nodes.
+            return Binary.new(self.type,self.operator,
+                              self.left.casts_without_expression,
+                              self.right.casts_without_expression)
+        end
+    end
+
+    
+
+    ## Extends the Select class with functionality for extracting 
+    #  expressions from cast.
+    class Select
+
+        # Extracts the expressions from the casts.
+        def casts_without_expression
+            # Recurse on the sub node.
+            return Select.new(self.type,"?", 
+                              self.select.casts_without_expression,
+                              *self.each_choice.map do |choice|
+                                  choice.casts_without_expression
+                              end )
+            return self
+        end
+    end
+
+
+    ## Extends the Concat class with functionality for converting booleans
+    #  in assignments to select operators.
+    class Concat
+        # Extracts the expressions from the casts.
+        def casts_without_expression
+            # Recurse on the sub expressions.
+            return Concat.new(self.type,self.each_expression.map do |expr|
+                expr.casts_without_expression
+            end )
+        end
+    end
+
+
+    ## Extends the RefConcat class with functionality for converting booleans
+    #  in assignments to select operators.
+    class RefConcat
+        # Extracts the expressions from the casts.
+        def casts_without_expression
+            # Recurse on the sub references.
+            return RefConcat.new(self.type,self.each_expression.map do |expr|
+                expr.casts_without_expression
+            end )
+        end
+    end
+
+
+    ## Extends the RefIndex class with functionality for converting booleans
+    #  in assignments to select operators.
+    class RefIndex
+        # Extracts the expressions from the casts.
+        def casts_without_expression
+            # Recurse on the sub references.
+            return RefIndex.new(self.type,
+                                self.ref.casts_without_expression,
+                                self.index.casts_without_expression)
+        end
+    end
+
+
+    ## Extends the RefRange class with functionality for converting booleans
+    #  in assignments to select operators.
+    class RefRange
+        # Extracts the expressions from the casts.
+        def casts_without_expression
+            # Recurse on the sub references.
+            return RefRange.new(self.type,
+                                self.ref.casts_without_expression,
+                                self.range.first.casts_without_expression ..
+                                self.range.last.casts_without_expression)
+        end
+    end
+
+
+    ## Extends the RefName class with functionality for converting booleans
+    #  in assignments to select operators.
+    class RefName
+        # Extracts the expressions from the casts.
+        def casts_without_expression
+            # Recurse on the sub references.
+            return RefName.new(self.type,
+                               self.ref.casts_without_expression,
+                               self.name)
+        end
+    end
+
+
+    ## Extends the RefThis class with functionality for converting booleans
+    #  in assignments to select operators.
+    class RefThis 
+        # Extracts the expressions from the casts.
+        def casts_without_expression
+            # Simply clone.
+            return self.clone
+        end
+    end
+end

data/lib/HDLRuby/hruby_verilog.rb

@@ -11,6 +11,10 @@ include HDLRuby::Verilog
 module HDLRuby::Low
 
 
+    # The list of base types used both in verilog and HDLRuby
+    VERILOG_BASE_TYPES = ["signed"]
+
+
 # Sample of very handy for programming.
 # puts "class=#{self.yes.class}"       # Confirm class of self.yes.
 # puts "methods=#{self.right.methods}" # Confirm method of self.right.
@@ -456,7 +460,10 @@ class Block
                             $fm.fm_par["#{tmt.left.to_verilog}"] = tmt.right
                         end
                         new_block.add_statement(tmt.clone)           
-                    end         
+                    end
+                else
+                    # Other statements are simply added as is.
+                    new_block.add_statement(statement.clone)
                 end
             end
 
@@ -1349,7 +1356,8 @@ end
 class TypeVector
     # Converts the system to Verilog code.
     def to_verilog
-        if self.base.name.to_s != "bit"
+        # if self.base.name.to_s != "bit"
+        if VERILOG_BASE_TYPES.include?(self.base.name.to_s)
             return " #{self.base.name.to_s}[#{self.range.first}:#{self.range.last}]"
         end
         return " [#{self.range.first}:#{self.range.last}]"
@@ -1598,7 +1606,7 @@ end
 class Unary
     # Converts the system to Verilog code.
     def to_verilog
-        return "#{self.operator}#{self.child.to_verilog}"
+        return "#{self.operator[0]}#{self.child.to_verilog}"
     end
 end
 
@@ -1609,10 +1617,37 @@ class Cast
     #       by traditional verilog.
     def to_verilog
         # return "#{self.type.to_verilog}'(#{self.child.to_verilog})"
+        if self.child.is_a?(Value) then
+            return self.child.to_verilog
+        end
+        # Get the type widths, used for computing extensions or truncations.
+        cw = self.child.type.width
+        sw = self.type.width
         if self.type.signed? then
-            return "$signed(#{self.child.to_verilog})"
+            # return "$signed(#{self.child.to_verilog})"
+            if (sw>cw) then
+                # Need to sign extend.
+                return "$signed({{#{sw-cw}{#{self.child.to_verilog}[#{cw-1}]}}," +
+                  "#{self.child.to_verilog}})"
+            elsif (sw<cw) then
+                # Need to truncate
+                return "$signed(#{self.child.to_verilog}[#{sw-1}:0])"
+            else
+                # Only enforce signed.
+                return "$signed(#{self.child.to_verilog})"
+            end
         else
-            return "$unsigned(#{self.child.to_verilog})"
+            # return "$unsigned(#{self.child.to_verilog})"
+            if (sw>cw) then
+                # Need to extend.
+                return "$unsigned({{#{sw-cw}{1'b0}},#{self.child.to_verilog}})"
+            elsif (sw<cw) then
+                # Need to truncate
+                return "$unsigned(#{self.child.to_verilog}[#{sw-1}:0])"
+            else
+                # Only enforce signed.
+                return "$unsigned(#{self.child.to_verilog})"
+            end
         end
     end
 end
@@ -1670,15 +1705,15 @@ class Delay
     def to_verilog
         time = self.value.to_s
         if(self.unit.to_s == "ps") then
-            return "##{time}"
+            return "##{time};"
         elsif(self.unit.to_s == "ns")
-            return "##{time}000"
+            return "##{time}000;"
         elsif(self.unit.to_s == "us")
-            return "##{time}000000"
+            return "##{time}000000;"
         elsif(self.unit.to_s == "ms")
-            return "##{time}000000000"
+            return "##{time}000000000;"
         elsif(self.unit.to_s == "s")
-            return "##{time}000000000000"
+            return "##{time}000000000000;"
         end
     end
 end
@@ -1750,10 +1785,12 @@ class SystemT
         end
         # And the array types signals.
         self.each_signal do |sig|
-            regs << sig.to_verilog if sig.type.is_a?(TypeVector) && sig.type.base.is_a?(TypeVector)
+            # regs << sig.to_verilog if sig.type.is_a?(TypeVector) && sig.type.base.is_a?(TypeVector)
+            regs << sig.to_verilog if sig.type.vector? && sig.type.base.vector?
         end
         self.each_inner do |sig|
-            regs << sig.to_verilog if sig.type.is_a?(TypeVector) && sig.type.base.is_a?(TypeVector)
+            # regs << sig.to_verilog if sig.type.is_a?(TypeVector) && sig.type.base.is_a?(TypeVector)
+            regs << sig.to_verilog if sig.type.vector? && sig.type.base.vector?
         end
 
         # Code generation

data/lib/HDLRuby/std/connector.rb

@@ -9,13 +9,28 @@ module HDLRuby::High::Std
     # 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, in_ch, out_chs|
-        ev = ev.poswedge unless ev.is_a?(Event)
-        inner :in_ack, :in_req
+    # The optional req and ack arguments are the signals for controlling the
+    # duplicator using a handshake protocol. If set to nil, the duplicator
+    # runs automatically.
+    function :duplicator do |typ, ev, in_ch, out_chs, req = nil, ack = nil|
+        ev = ev.posedge unless ev.is_a?(Event)
+        inner :in_ack
+        inner :in_req
         out_acks = out_chs.size.times.map { |i| inner(:"out_ack#{i}") }
         typ.inner :data
         par(ev) do
-            in_req <= 1
+            if (ack) then
+                # Output ack mode.
+                ack <= 0
+            end
+            if (req) then
+                # Input request mode.
+                in_req <= 0
+                hif(req) { in_req <= 1 }
+            else
+                # Automatic mode.
+                in_req <= 1
+            end
             out_acks.each { |ack| ack <= 0 }
             out_acks.each do |ack| 
                 hif(ack == 1) { in_req <= 0 }
@@ -30,6 +45,10 @@ module HDLRuby::High::Std
                 end
                 hif (out_acks.reduce(_1) { |sum,ack| ack & sum }) do
                     out_acks.each { |ack| ack <= 0 }
+                    if (ack) then
+                        # Output ack mode.
+                        ack <= 1
+                    end
                 end
             end
         end
@@ -82,7 +101,7 @@ module HDLRuby::High::Std
             idx <= 0
             reading <= 0
             out_ack <= 0
-            # hif(idx == size) { in_reqs.each { |req| req <= 0 } }
+            hif(idx == size-1) { in_acks.each { |ack| ack <= 0 } }
             # hif((idx == 0) & (in_reqs.reduce(_1) { |sum,req| req & sum })) do
             hif(idx == 0) do
                 hif(~reading) do
@@ -90,7 +109,9 @@ module HDLRuby::High::Std
                 end
                 reading <= 1
                 in_chs.each_with_index do |ch,i|
-                    ch.read(datas[i]) { in_acks[i] <= 1 }
+                    hif(~in_acks[i]) do
+                        ch.read(datas[i]) { in_acks[i] <= 1 }
+                    end
                 end
             end
             hif(in_acks.reduce(_1) { |sum,req| req & sum }) do

data/lib/HDLRuby/std/memory.rb

@@ -289,9 +289,10 @@ HDLRuby::High::Std.channel(:mem_rom) do |typ,size,clk,rst,content,
             rst  = send(rst_name)
             top_block.unshift do
                 # Initialize the address so that the next access is at address 0.
-                hif(rst==1) { abus_r <= -1 }
-                # Reset so switch of the access trigger.
-                trig_r <= 0
+                # hif(rst==1) { abus_r <= -1 }
+                # # Reset so switch of the access trigger.
+                # trig_r <= 0
+                hif(rst==1) { abus_r <= -1; trig_r <= 0 }
             end
             # The read procedure.
         #     par do
@@ -317,6 +318,7 @@ HDLRuby::High::Std.channel(:mem_rom) do |typ,size,clk,rst,content,
                         # blk.call if blk
                         seq do
                             # abus_r <= abus_r + 1
+                            trig_r <= 0
                             target <= dbus_r
                             blk.call if blk
                         end
@@ -1704,6 +1706,127 @@ HDLRuby::High::Std.channel(:mem_bank) do |typ,nbanks,size,clk,rst,br_rsts = {}|
 
 end
 
+
+# Queue memory of +size+ elements of +typ+ typ, syncrhonized on +clk+
+# (positive and negative edges) and reset on +rst+.
+# At each rising edge of +clk+ a read and a write is guaranteed to be
+# completed provided they are triggered.
+#
+# NOTE: this channel does not have any branch.
+HDLRuby::High::Std.channel(:mem_queue) do |typ,size,clk,rst|
+    # The inner buffer of the queue.
+    typ[-size].inner :buffer
+    # The read and write pointers.
+    [size.width].inner :rptr, :wptr
+    # The read and write command signals.
+    inner :rreq, :wreq
+    # The read and write ack signals.
+    inner :rack, :wack
+    # The read/write data registers.
+    typ.inner :rdata, :wdata
+
+    # The flags telling of the channel is synchronized
+    inner :rsync, :wsync
+
+    # The process handling the decoupled access to the buffer.
+    par(clk.posedge) do
+        hif(rst) { rptr <= 0; wptr <= 0 }
+        helse do
+            hif(~rsync) do
+                hif (~rreq) { rack <= 0 }
+                hif(rreq & (~rack) & (rptr != wptr)) do
+                    rdata <= buffer[rptr]
+                    rptr <= (rptr + 1) % depth
+                    rack <= 1
+                end
+            end
+
+            hif(~wsync) do
+                hif (~wreq) { wack <= 0 }
+                hif(wreq & (~wack) & (((wptr+1) % size) != rptr)) do
+                    buffer[wptr] <= wdata
+                    wptr <= (wptr + 1) % size
+                    wack <= 1
+                end
+            end
+        end
+    end
+
+    reader_output :rreq, :rptr, :rsync
+    reader_input :rdata, :rack, :wptr, :buffer
+
+    # The read primitive.
+    reader do |blk,target|
+        if (cur_behavior.on_event?(clk.posedge,clk.negedge)) then
+            # Same clk event, synchrone case: perform a direct access.
+            # Now perform the access.
+            top_block.unshift do
+                rsync <= 1
+                rreq <= 0
+            end
+            seq do
+                hif(rptr != wptr) do
+                    # target <= rdata
+                    target <= buffer[rptr]
+                    rptr <= (rptr + 1) % size
+                    blk.call if blk
+                end
+            end
+        else
+            # Different clk event, perform a decoupled access.
+            top_block.unshift do
+                rsync <= 0
+                rreq <= 0
+            end
+            par do
+                hif (~rack) { rreq <= 1 }
+                helsif(rreq) do
+                    rreq <= 0
+                    target <= rdata
+                    blk.call if blk
+                end
+            end
+        end
+    end
+
+    writer_output :wreq, :wdata, :wptr, :wsync, :buffer
+    writer_input :wack, :rptr
+
+    # The write primitive.
+    writer do |blk,target|
+        if (cur_behavior.on_event?(clk.negedge,clk.posedge)) then
+            # Same clk event, synchrone case: perform a direct access.
+            top_block.unshift do
+                wsync <= 1
+                wreq <= 0
+            end
+            hif(((wptr+1) % size) != rptr) do
+                buffer[wptr] <= target
+                wptr <= (wptr + 1) % size
+                blk.call if blk
+            end
+        else
+            # Different clk event, asynchrone case: perform a decoupled access.
+            top_block.unshift do
+                wsync <= 0
+                wreq <= 0
+            end
+            seq do
+                hif (~wack) do
+                    wreq <= 1
+                    wdata <= target
+                end
+                helsif(wreq) do
+                    wreq <= 0
+                    blk.call if blk
+                end
+            end
+        end
+    end
+end
+
+
+
 # HDLRuby::High::Std.channel(:mem_bank) do |typ,nbanks,size,clk,rst,br_rsts = {}|
 #     # Ensure typ is a type.
 #     typ = typ.to_type

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.4.18"
+  VERSION = "2.4.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.4.18
+  version: 2.4.25
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,6 +126,7 @@ files:
 - lib/HDLRuby/hdr_samples/with_channel.rb
 - lib/HDLRuby/hdr_samples/with_class.rb
 - lib/HDLRuby/hdr_samples/with_connector.rb
+- lib/HDLRuby/hdr_samples/with_connector_memory.rb
 - lib/HDLRuby/hdr_samples/with_decoder.rb
 - lib/HDLRuby/hdr_samples/with_fixpoint.rb
 - lib/HDLRuby/hdr_samples/with_fsm.rb
@@ -206,6 +207,7 @@ files:
 - lib/HDLRuby/hruby_low2sym.rb
 - lib/HDLRuby/hruby_low2vhd.rb
 - lib/HDLRuby/hruby_low_bool2select.rb
+- lib/HDLRuby/hruby_low_casts_without_expression.rb
 - lib/HDLRuby/hruby_low_cleanup.rb
 - lib/HDLRuby/hruby_low_fix_types.rb
 - lib/HDLRuby/hruby_low_mutable.rb