HDLRuby 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f74ac40d2f3ddc8ec9eb5a17c8d48b091068288a4bdb37adad8008c9b29e78
-  data.tar.gz: '084b85f61816a823c92b736e1d203274f3e1beb2b2278f240bee36218665afe7'
+  metadata.gz: ce1d3b652bf8a3590f023acab0e74ec08d6062df5ccbc38fb1e1cbeb2cd41028
+  data.tar.gz: 52461928e01080214a4fb6ce0f1f852c6403d26bfd152579755e6b2990c396d2
 SHA512:
-  metadata.gz: ef3418dda3d976fe68beb65a305c6163da94cdecf398ddd9bbc06786abc3c130b8df6ecd3a94064ecc0ffc64105a63838c455bd0709c3f64c83f2e40d7406a2b
-  data.tar.gz: 8c9284a2c34be1f2e39b55cac6419ea858dd4972f9715bf2e39317bdcc4d7fcdcffae4d5c76ff3bbfabd77acd1a295a2cbba651568c569e144900e47814fc072
+  metadata.gz: 193afd5d38ef5159a89630f9f44be2e43c95925f9d6f0d037616e26fb9dc5538fce721be53ebfc7c08ce303e6937f7eddf6bf6493cb741c485ec878c538c28a6
+  data.tar.gz: d666fca088c1c737f81cccbbc58982e194ee0cff2fcd801e2ac9f13d504de04f3be4f3dae66dd6408af1c9d079b3f9c7dad0334c08bd77ad20daaae513058f92

data/lib/HDLRuby/hdr_samples/adder_kadai.rb

@@ -0,0 +1,7 @@
+system :adder do
+    [4].input :a,:b
+    [4].output :x
+    output :carry
+
+    [x,carry] <= a.as([5])+b
+end

data/lib/HDLRuby/hruby_low.rb

@@ -3696,6 +3696,16 @@ module HDLRuby::Low
         def hash
             return super
         end
+
+        # Gets the top block, i.e. the first block of the current behavior.
+        def top_block
+            raise AnyError, "Connections are not within blocks."
+        end
+
+        # Gets the top scope, i.e. the first scope of the current system.
+        def top_scope
+            return self.parent.is_a?(Scope) ? self.parent : self.parent.top_scope
+        end
     end
 
 

data/lib/HDLRuby/hruby_low_without_concat.rb

@@ -41,7 +41,8 @@ module HDLRuby::Low
                 if nconnection.is_a?(Block) then
                     # The connection has been broken, remove the former
                     # version and add the generated block as a behavior.
-                    self.remove_connection(connection)
+                    # self.remove_connection(connection)
+                    self.delete_connection!(connection)
                     self.add_behavior(Behavior.new(nconnection))
                 end
             end
@@ -159,4 +160,89 @@ module HDLRuby::Low
             return self
         end
     end
+
+
+    ## Extends the Connection class with functionality for breaking assingments
+    #  to concats.
+    class Connection
+        # Break the assignments to concats.
+        #
+        # NOTE: when breaking generates a new Block containing the broken
+        #       assignments.
+        def break_concat_assigns
+            # puts "break_concat_assigns with self=#{self}"
+            # Is the left value a RefConcat?
+            self.left.each_node_deep do |node|
+                if node.is_a?(RefConcat) then
+                    # Yes, must break. Create the resulting sequential
+                    # block that will contain the new assignements.
+                    block = Block.new(:seq)
+                    # Create an intermediate signal for storing the
+                    # right value. Put it in the top scope.
+                    top_scope = self.top_scope
+                    aux = top_scope.add_inner(
+                        SignalI.new(HDLRuby.uniq_name,self.right.type) )
+                    # puts "new signal: #{aux.name}"
+                    aux = RefName.new(aux.type,RefThis.new,aux.name)
+                    # Set a default value to avoid latch generation.
+                    block.insert_statement!(0,
+                            Transmit.new(aux.clone,Value.new(aux.type,0)))
+                    # Replace the concat in the copy of the left value.
+                    if left.eql?(node) then
+                        # node was the top of left, replace here.
+                        nleft = aux
+                    else
+                        # node was inside left, replace within left.
+                        nleft = self.left.clone
+                        nleft.each_node_deep do |ref|
+                            ref.map_nodes! do |sub|
+                                sub.eql?(node) ? aux.clone : sub
+                            end
+                        end
+                    end
+                    # Recreate the transmit and add it to the block.
+                    block.add_statement(
+                        Transmit.new(nleft,self.right.clone) )
+                    # And assign its part to each reference of the
+                    # concat.
+                    pos = 0
+                    node.each_ref.reverse_each do |ref|
+                        # Compute the range to assign.
+                        range = ref.type.width-1+pos .. pos
+                        # Single or multi-bit range?
+                        sbit = range.first == range.last
+                        # Convert the range to an HDLRuby range for 
+                        # using is the resulting statement.
+                        # Create and add the statement.
+                        if sbit then
+                            # Single bit.
+                            # Generate the index.
+                            idx = Value.new(Integer,range.first)
+                            # Generate the assignment.
+                            block.add_statement(
+                                Transmit.new(ref.clone,
+                                RefIndex.new(aux.type.base, aux.clone, idx)))
+                        else
+                            # Multi-bits.
+                            # Compute the type of the right value.
+                            rtype = TypeVector.new(:"",aux.type.base,range)
+                            # Generate the range.
+                            range = Value.new(Integer,range.first) ..
+                                    Value.new(Integer,range.last)
+                            # Generate the assignment.
+                            block.add_statement(
+                                Transmit.new(ref.clone,
+                                RefRange.new(rtype, aux.clone, range)))
+                        end
+                        pos += ref.type.width
+                    end
+                    # puts "Resulting block=#{block.to_vhdl}"
+                    # Return the resulting block
+                    return block
+                end
+            end
+            # No, nothing to do.
+            return self
+        end
+    end
 end

data/lib/HDLRuby/hruby_verilog.rb

@@ -1537,8 +1537,15 @@ end
 # Used when casting expressions.
 class Cast
     # Converts the system to Verilog code.
+    # NOTE: the cast is rounded up size bit-width cast is not supported
+    #       by traditional verilog.
     def to_verilog
-        return "#{self.type.to_verilog}'(#{self.child.to_verilog})"
+        # return "#{self.type.to_verilog}'(#{self.child.to_verilog})"
+        if self.type.signed? then
+            return "$signed(#{self.child.to_verilog})"
+        else
+            return "$unsigned(#{self.child.to_verilog})"
+        end
     end
 end
 

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.2.0"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - lib/HDLRuby/hdr_samples/adder_assign_error.rb
 - lib/HDLRuby/hdr_samples/adder_bench.rb
 - lib/HDLRuby/hdr_samples/adder_gen.rb
+- lib/HDLRuby/hdr_samples/adder_kadai.rb
 - lib/HDLRuby/hdr_samples/adder_nodef_error.rb
 - lib/HDLRuby/hdr_samples/addsub.rb
 - lib/HDLRuby/hdr_samples/addsubz.rb