HDLRuby 2.4.22 → 2.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd32be1a749a209488dea4e2d6d05c8c90a2a181ce48575288e33dc65c25ff02
-  data.tar.gz: fc615ba447dc1fe712b2620f39d4f6fbbc1a5a698efa2c38b0ca4f075dc5a53f
+  metadata.gz: 4d049304b2681a96575ee9e398827724e0262404e973b8c73f830176ec94dffa
+  data.tar.gz: '0472118ef46e7bff7df577fb19dd66396da8a65bc5f9f442967346f4b640ed80'
 SHA512:
-  metadata.gz: 6b81a944107060ac2844260d83d90cac747decf72b3facf9fa06bb4453267679de12dbbc72c08a3016701a304ef1c1941b7689358e125cd00d1112f028e302cb
-  data.tar.gz: 369b9864dc3504ab0536c6e3a1df19b70cda921f46c1680bfdf7b78087348f93864285dada62e52db9ab105b15510cb98c1054bfd870d01ee13913e3d5216d4e
+  metadata.gz: 291dd1ed58fd73a420fc9681a6a64e3cb96ff6667164a98d85bb164723b83e3e5d285ff65a495f3f5f6705423b7ae879f0577386227483b0bd9b5254782774c6
+  data.tar.gz: a9f88a800878ed07c5e3a56bd0a70e3bd7c329a39e5576a36c044c14535d6104f7906444467d4c1f3a27c518da9fc14364ba5c6e02bdd437c5b0dba12fac4268

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_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

@@ -460,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
 
@@ -1603,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
 
@@ -1614,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
@@ -1675,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

data/lib/HDLRuby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.4.22
+  version: 2.4.25
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-01 00:00:00.000000000 Z
+date: 2021-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -207,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