HDLRuby 2.11.4 → 2.11.7

data/lib/HDLRuby/hruby_rsim_vcd.rb

@@ -11,6 +11,35 @@ module HDLRuby::High
         return name.to_s.gsub(/[^a-zA-Z0-9_$]/,"$")
     end
 
+    ## Converts a bit string to a vcd format.
+    def self.vcd_bitstr(str)
+        if str.length > 1 then
+            return "b" + str + " "
+        else
+            return str
+        end
+    end
+
+    ## Converts a HDLRuby object to a VCD id string.
+    @@rsim_object_idstr = { }
+    @@rsim_object_idstr_count = 0
+    def self.vcd_idstr(obj)
+        idstr = @@rsim_object_idstr[obj]
+        unless idstr then
+            # Must generate a new id string.
+            chars = []
+            id = @@rsim_object_idstr_count
+            @@rsim_object_idstr_count += 1
+            loop do
+                chars << ((id % (127-33)) + 33).chr
+                break if ((id=id/(127-33)) == 0)
+            end
+            idstr = chars.join
+            @@rsim_object_idstr[obj] = idstr
+        end
+        return idstr
+    end
+
     ##
     # Enhance the system type class with VCD support.
     class SystemT
@@ -40,14 +69,24 @@ module HDLRuby::High
             # Closes the header.
             @vcdout << "$enddefinitions $end\n"
             # Initializes the variables with their name.
-            @vars_with_fullname = self.get_vars_with_fullname
+            # @vars_with_fullname = self.get_vars_with_fullname
+            @vars_with_idstr = self.get_vars_with_idstr
             @vcdout << "$dumpvars\n"
-            @vars_with_fullname.each_pair do |sig,fullname|
+            # @vars_with_fullname.each_pair do |sig,fullname|
+            #     if sig.f_value then
+            #         @vcdout << "   b#{sig.f_value.to_vstr} #{fullname}\n"
+            #     else
+            #         @vcdout << "   b#{"x"} #{fullname}\n"
+            #     end
+            # end
+            @vars_with_idstr.each_pair do |sig,idstr|
                 if sig.f_value then
-                    @vcdout << "   b#{sig.f_value.to_vstr} #{fullname}\n"
+                    # @vcdout << "   b#{sig.f_value.to_vstr} #{idstr}\n"
+                    @vcdout << HDLRuby::High.vcd_bitstr(sig.f_value.to_vstr) <<
+                               idstr << "\n"
                 else
-                    # @vcdout << "   b#{"x"*sig.type.width} #{fullname}\n"
-                    @vcdout << "   b#{"x"} #{fullname}\n"
+                    # @vcdout << "   b#{"x"} #{idstr}\n"
+                    @vcdout << HDLRuby::High.vcd_bitstr("x") << idstr << "\n"
                 end
             end
             @vcdout << "$end\n"
@@ -63,6 +102,16 @@ module HDLRuby::High
             return self.scope.get_vars_with_fullname(vars_with_fullname)
         end
 
+        ## Gets the VCD variables with their id string.
+        def get_vars_with_idstr(vars_with_idstr = {})
+            # Adds the signals of the interface of the system.
+            self.each_signal do |sig|
+                vars_with_idstr[sig] = HDLRuby::High.vcd_idstr(sig)
+            end
+            # Recurse on the scope.
+            return self.scope.get_vars_with_idstr(vars_with_idstr)
+        end
+
         ## Shows the hierarchy of the variables.
         def show_hierarchy(vcdout)
             # puts "show_hierarchy for module #{self} (#{self.name})"
@@ -72,7 +121,8 @@ module HDLRuby::High
             self.each_signal do |sig|
                 # puts "showing signal #{HDLRuby::High.vcd_name(sig.fullname)}"
                 vcdout << "$var wire #{sig.type.width} "
-                vcdout << "#{HDLRuby::High.vcd_name(sig.fullname)} "
+                # vcdout << "#{HDLRuby::High.vcd_name(sig.fullname)} "
+                vcdout << "#{HDLRuby::High.vcd_idstr(sig)} "
                 vcdout << "#{HDLRuby::High.vcd_name(sig.name)} $end\n"
             end
             # Recurse on the scope.
@@ -88,8 +138,9 @@ module HDLRuby::High
 
         ## Displays the value of signal +sig+.
         def show_signal(sig)
-            @vcdout << "b#{sig.f_value.to_vstr} "
-            @vcdout << "#{@vars_with_fullname[sig]}\n"
+            # @vcdout << "b#{sig.f_value.to_vstr} "
+            @vcdout << HDLRuby::High.vcd_bitstr(sig.f_value.to_vstr)
+            @vcdout << "#{@vars_with_idstr[sig]}\n"
         end
 
         ## Displays value +val+.
@@ -121,7 +172,8 @@ module HDLRuby::High
             self.each_inner do |sig|
                 # puts "showing inner signal #{HDLRuby::High.vcd_name(sig.fullname)}"
                 vcdout << "$var wire #{sig.type.width} "
-                vcdout << "#{HDLRuby::High.vcd_name(sig.fullname)} "
+                # vcdout << "#{HDLRuby::High.vcd_name(sig.fullname)} "
+                vcdout << "#{HDLRuby::High.vcd_idstr(sig)} "
                 vcdout << "#{HDLRuby::High.vcd_name(sig.name)} $end\n"
             end
             # Recurse on the behaviors' blocks
@@ -162,6 +214,27 @@ module HDLRuby::High
             end
             return vars_with_fullname
         end
+
+        ## Gets the VCD variables with their id string.
+        def get_vars_with_idstr(vars_with_idstr = {})
+            # Adds the inner signals.
+            self.each_inner do |sig|
+                vars_with_idstr[sig] = HDLRuby::High.vcd_idstr(sig)
+            end
+            # Recurse on the behaviors' blocks
+            self.each_behavior do |beh|
+                beh.block.get_vars_with_idstr(vars_with_idstr)
+            end
+            # Recurse on the systemI's Eigen system.
+            self.each_systemI do |sys|
+                sys.systemT.get_vars_with_idstr(vars_with_idstr)
+            end
+            # Recurse on the subscopes.
+            self.each_scope do |scope|
+                scope.get_vars_with_idstr(vars_with_idstr)
+            end
+            return vars_with_idstr
+        end
     end
 
 
@@ -177,6 +250,11 @@ module HDLRuby::High
         def get_vars_with_fullname(vars_with_fullname = {})
             # By default: nothing to do
         end
+
+        ## Gets the VCD variables with their id string.
+        def get_vars_with_idstr(vars_with_idstr = {})
+            # By default: nothing to do
+        end
     end
 
     ##
@@ -192,6 +270,11 @@ module HDLRuby::High
         def get_vars_with_fullname(vars_with_fullname = {})
             # By default: nothing to do
         end
+
+        ## Gets the VCD variables with their idstr.
+        def get_vars_with_idstr(vars_with_idstr = {})
+            # By default: nothing to do
+        end
     end
 
     ##
@@ -206,6 +289,11 @@ module HDLRuby::High
         def get_vars_with_fullname(vars_with_fullname = {})
             # By default: nothing to do
         end
+
+        ## Gets the VCD variables with their id string.
+        def get_vars_with_idstr(vars_with_idstr = {})
+            # By default: nothing to do
+        end
     end
 
     ##
@@ -220,6 +308,11 @@ module HDLRuby::High
         def get_vars_with_fullname(vars_with_fullname = {})
             # By default: nothing to do
         end
+
+        ## Gets the VCD variables with their id string.
+        def get_vars_with_idstr(vars_with_idstr = {})
+            # By default: nothing to do
+        end
     end
 
 
@@ -238,7 +331,8 @@ module HDLRuby::High
             self.each_inner do |sig|
                 # puts "showing inner signal #{HDLRuby::High.vcd_name(sig.fullname)}"
                 vcdout << "$var wire #{sig.type.width} "
-                vcdout << "#{HDLRuby::High.vcd_name(sig.fullname)} "
+                # vcdout << "#{HDLRuby::High.vcd_name(sig.fullname)} "
+                vcdout << "#{HDLRuby::High.vcd_idstr(sig)} "
                 vcdout << "#{HDLRuby::High.vcd_name(sig.name)} $end\n"
             end
             # Recurse on the statements
@@ -263,6 +357,19 @@ module HDLRuby::High
             end
             return vars_with_fullname
         end
+
+        ## Gets the VCD variables with their id string.
+        def get_vars_with_idstr(vars_with_idstr = {})
+            # Adds the inner signals.
+            self.each_inner do |sig|
+                vars_with_idstr[sig] = HDLRuby::High.vcd_idstr(sig)
+            end
+            # Recurse on the statements.
+            self.each_statement do |stmnt|
+                stmnt.get_vars_with_idstr(vars_with_idstr)
+            end
+            return vars_with_idstr
+        end
     end
 
 
@@ -307,6 +414,19 @@ module HDLRuby::High
             self.no.get_vars_with_fullname(vars_with_fullname) if self.no
             return vars_with_fullname
         end
+
+        ## Gets the VCD variables with their id string.
+        def get_vars_with_idstr(vars_with_idstr = {})
+            # Recurse on the yes.
+            self.yes.get_vars_with_idstr(vars_with_idstr)
+            # Recurse on the noifs.
+            self.each_noif do |cond,stmnt|
+                stmnt.get_vars_with_idstr(vars_with_idstr)
+            end
+            # Recure on the no if any.
+            self.no.get_vars_with_idstr(vars_with_idstr) if self.no
+            return vars_with_idstr
+        end
     end
 
 
@@ -320,7 +440,7 @@ module HDLRuby::High
                 w.statement.show_hierarchy(vcdout)
             end
             # Recurse on the default if any.
-            self.default.show_hierarchy(vcdout)
+            self.default.show_hierarchy(vcdout) if self.default
         end
 
         ## Gets the VCD variables with their long name.
@@ -330,8 +450,44 @@ module HDLRuby::High
                 w.statement.get_vars_with_fullname(vars_with_fullname)
             end
             # Recurse on the default if any.
-            self.default.get_vars_with_fullname(vars_with_fullname)
+            self.default.get_vars_with_fullname(vars_with_fullname) if self.default
+            return vars_with_fullname
+        end
+
+        ## Gets the VCD variables with their id string.
+        def get_vars_with_idstr(vars_with_idstr = {})
+            # Recurse on each when.
+            self.each_when do |w|
+                w.statement.get_vars_with_idstr(vars_with_idstr)
+            end
+            # Recurse on the default if any.
+            self.default.get_vars_with_idstr(vars_with_idstr) if self.default
+            return vars_with_idstr
+        end
+    end
+
+    ##
+    # Enhance the TimeRepeat class with VCD support.
+    class TimeRepeat
+        ## Shows the hierarchy of the variables.
+        def show_hierarchy(vcdout)
+            # Recurse on the statement.
+            self.statement.show_hierarchy(vcdout)
+        end
+
+        ## Gets the VCD variables with their long name.
+        def get_vars_with_fullname(vars_with_fullname = {})
+            # Recurse on the statement.
+            self.statement.get_vars_with_fullname(vars_with_fullname)
             return vars_with_fullname
         end
+
+        ## Gets the VCD variables with their id string.
+        def get_vars_with_idstr(vars_with_idstr = {})
+            # Recurse on the statement.
+            self.statement.get_vars_with_idstr(vars_with_idstr)
+            return vars_with_idstr
+        end
     end
+
 end

data/lib/HDLRuby/hruby_values.rb

@@ -34,7 +34,6 @@ module HDLRuby
           :==, :!=, :<, :>, :<=, :>=, :<=>  ].
           each do |op|
             define_method(op) do |val|
-                # puts "op=#{op} value=#{value}"
                 # Ensures val is computable.
                 unless val.to_value? then
                     # Not computable, use the former method that generates
@@ -45,6 +44,7 @@ module HDLRuby
                 if self.content.is_a?(Numeric) && val.content.is_a?(BitString)
                     if val.content.specified? then
                         res_content = self.content.send(op,val.content.to_i)
+                        # puts "op=#{op} self.content=#{self.content} val.content=#{val.content.to_i} res_content=#{res_content}"
                     else
                         res_content = 
                             BitString.new(self.content).send(op,val.content)
@@ -52,7 +52,7 @@ module HDLRuby
                 else
                     # Generate the resulting content.
                     res_content = self.content.send(op,val.content)
-                    # puts "op=#{op} self.content=#{self.content} (#{self.content.class}) val.content=#{val.content} (#{val.content.class}) res_content=#{res_content} (#{res_content.class})"
+                    # puts "op=#{op} self.content=#{self.content} (#{self.content.to_i}) val.content=#{val.content} (#{val.content.to_i}) res_content=#{res_content} (#{res_content.class})" if op == :^
                 end
                 res_type = self.type.resolve(val.type)
                 # # Adjust the result content size.
@@ -374,6 +374,23 @@ module HDLRuby
             return other,self.content
         end
 
+        # Hash-map comparison of values.
+        # Also use in simulation engines to know if a signal changed.
+        def eql?(val)
+            if self.content.is_a?(Numeric) then
+                return self.content == val if val.is_a?(Numeric)
+                return self.content == val.content if val.content.is_a?(Numeric)
+                return false unless val.content.specified?
+                return self.content == val.content.to_i
+            else
+                return self.content.to_i == val if val.is_a?(Numeric)
+                return self.content.eql?(val.content) unless val.content.is_a?(Numeric)
+                return false if self.content.specified?
+                return self.content.to_i == val.content
+            end
+        end
+
+
         # Tell if the value is zero.
         def zero?
             return false unless @content

data/lib/HDLRuby/hruby_verilog.rb

@@ -1524,7 +1524,14 @@ module HDLRuby::Low
         # Converts the system to Verilog code.
         def to_verilog
             # Outputs the first and second choices (choice (0) and choice (1)).
-            return "#{self.select.to_verilog} == 1 #{self.operator} #{self.get_choice(0).to_verilog} : #{self.get_choice(1).to_verilog}"
+            # return "#{self.select.to_verilog} == 1 #{self.operator} #{self.get_choice(0).to_verilog} : #{self.get_choice(1).to_verilog}"
+            res = ""
+            sels = self.select.to_verilog
+            @choices[0..-2].each_with_index do |choice,i|
+                res << "#{sels} == #{i} ? #{choice.to_verilog} : "
+            end
+            res << @choices[-1].to_verilog
+            return res
         end
     end
 
@@ -1534,18 +1541,36 @@ module HDLRuby::Low
         # Converts the system to Verilog code.
         # If it is bit, it is b, and if it is int, it is represented by d. (Example: 4'b0000, 32'd1)
         def to_verilog(unknown = nil)
-            if self.type.base.name.to_s == "bit"
-                return "#{self.type.range.first + 1}'b#{self.content.to_verilog}"
-            elsif self.type.name.to_s == "integer"
-                str = self.content.to_verilog
-                if str[0] == "-" then
-                    # Negative value.
-                    return "-#{self.type.range.first + 1}'d#{str[1..-1]}"
+            # if self.type.base.name.to_s == "bit"
+            # if self.type.unsigned? then
+            #     # return "#{self.type.range.first + 1}'b#{self.content.to_verilog}"
+            #     return "#{self.type.width}'b#{self.content.to_verilog}"
+            # elsif self.type.name.to_s == "integer"
+            #     str = self.content.to_verilog
+            #     if str[0] == "-" then
+            #         # Negative value.
+            #         return "-#{self.type.range.first + 1}'d#{str[1..-1]}"
+            #     else
+            #         return "#{self.type.range.first + 1}'d#{str}"
+            #     end
+            # end
+            # return "#{self.type.range.first + 1}'b#{self.content.to_verilog}"
+            if self.content.is_a?(Numeric) then
+                if self.content < 0 then
+                    # str = (2**self.type.width + self.content).to_s(2)
+                    str = self.content.to_s(2)
+                    str = "0" * (self.type.width-str.length+1) + str[1..-1]
+                    return "-#{self.type.width}'b#{str}"
                 else
-                    return "#{self.type.range.first + 1}'d#{str}"
+                    str = self.content.to_s(2)
+                    str = "0" * (self.type.width-str.length) + str
+                    return "#{self.type.width}'b#{str}"
                 end
+                # return "#{self.type.width}'b#{str}"
+            else
+                str = self.content.to_verilog
+                return "#{str.length}'b#{str}"
             end
-            return "#{self.type.range.first + 1}'b#{self.content.to_verilog}"
         end
         # How to use when simply obtaining the width
         def to_getrange
@@ -1602,7 +1627,6 @@ module HDLRuby::Low
 
             result = " " * spc # Indented based on space_count.
 
-            result = ""
             result << "case(#{self.value.to_verilog})\n"
 
             # n the case statement, each branch is partitioned by when. Process each time when.
@@ -1611,18 +1635,19 @@ module HDLRuby::Low
                 result << " " * (spc+3) + "#{whens.match.to_verilog}: "
 
                 if whens.statement.each_statement.count >= 1 then
-                    result << whens.statement.to_verilog(spc+3)
+                    result << whens.statement.to_verilog(spc+3) << "\n"
                 else
-                    result << "\n"
+                    result << ";\n"
                 end
             end
             if self.default then
+                result << " " * (spc+3) + "default: "
                 if self.default.each_statement.count >= 1 then
                     result << self.default.each_statement.map do |stmnt|
                         stmnt.to_verilog(spc+3)
-                    end.join("\n")
+                    end.join("\n") << "\n"
                 else
-                    result << "\n"
+                    result << ";\n"
                 end
             end
             result << " " * spc + "endcase\n" # Conclusion.
@@ -2032,6 +2057,9 @@ module HDLRuby::Low
             # Generate content code.
             codeC = ""
 
+            # Arrays to initialize.
+            arrays_to_init = []
+
             # Declare "inner".
             self.each_inner do |inner|
                 if HDLRuby::Low::VERILOG_REGS.include?(inner.to_verilog) then
@@ -2050,8 +2078,14 @@ module HDLRuby::Low
                     codeC << " #{inner.type.to_verilog}#{inner.to_verilog}"
                 end
                 if inner.value then
-                    # There is an initial value.
-                    codeC << " = #{inner.value.to_verilog}"
+                    val = inner.value
+                    val = val.child while val.is_a?(Cast)
+                    if val.is_a?(Concat) then
+                        arrays_to_init << [inner,val]
+                    else
+                        # There is an initial value.
+                        codeC << " = #{inner.value.to_verilog}"
+                    end
                 end
                 codeC << ";\n"
             end
@@ -2192,6 +2226,22 @@ module HDLRuby::Low
 
             end
 
+            # Generate the code for the initialization of the arrays.
+            if arrays_to_init.any? then
+                codeC << "   initial begin\n"
+                arrays_to_init.each do |(sig,val)|
+                    val.each_expression.with_index do |expr,i|
+                        # Initialization, therefore maybe no cast required...
+                        # if sig.value.is_a?(Cast) then
+                        #     expr = Cast.new(sig.value.type,expr.clone)
+                        # end
+                        codeC << "      ";
+                        codeC << "#{sig.to_verilog}[#{i}]=#{expr.to_verilog};\n"
+                    end
+                end
+                codeC << "   end\n"
+            end
+
             # Conclusion.
             codeC << "\nendmodule"
 

data/lib/HDLRuby/std/fsm.rb

@@ -120,10 +120,10 @@ module HDLRuby::High::Std
 
             # Enters the current system
             HDLRuby::High.cur_system.open do
-                sub do
+                # sub do
                     HDLRuby::High.space_push(namespace)
                     # Execute the instantiation block
-                    return_value =HDLRuby::High.top_user.instance_exec(&ruby_block)
+                    return_value = HDLRuby::High.top_user.instance_exec(&ruby_block)
 
                     # Expands the extra state processing so that al all the
                     # parts of the state machine are in par (clear synthesis).
@@ -311,7 +311,7 @@ module HDLRuby::High::Std
                     end
 
                     HDLRuby::High.space_pop
-                end
+                # end
             end
 
             return return_value

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.11.4"
+  VERSION = "2.11.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.11.7
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - ext/hruby_sim/hruby_sim_calc.c
 - ext/hruby_sim/hruby_sim_core.c
 - ext/hruby_sim/hruby_sim_list.c
+- ext/hruby_sim/hruby_sim_mute.c
 - ext/hruby_sim/hruby_sim_stack_calc.c
 - ext/hruby_sim/hruby_sim_stack_calc.c.sav
 - ext/hruby_sim/hruby_sim_tree_calc.c
@@ -96,11 +97,13 @@ files:
 - lib/HDLRuby/hdr_samples/addsub.rb
 - lib/HDLRuby/hdr_samples/addsubz.rb
 - lib/HDLRuby/hdr_samples/alu.rb
+- lib/HDLRuby/hdr_samples/arith_bench.rb
 - lib/HDLRuby/hdr_samples/bstr_bench.rb
 - lib/HDLRuby/hdr_samples/calculator.rb
 - lib/HDLRuby/hdr_samples/case_bench.rb
 - lib/HDLRuby/hdr_samples/comparison_bench.rb
 - lib/HDLRuby/hdr_samples/constant_in_function.rb
+- lib/HDLRuby/hdr_samples/constant_prop_bench.rb
 - lib/HDLRuby/hdr_samples/counter_bench.rb
 - lib/HDLRuby/hdr_samples/counter_dff_bench.rb
 - lib/HDLRuby/hdr_samples/dff.rb
@@ -286,6 +289,7 @@ files:
 - lib/HDLRuby/hruby_low_without_select.rb
 - lib/HDLRuby/hruby_rcsim.rb
 - lib/HDLRuby/hruby_rsim.rb
+- lib/HDLRuby/hruby_rsim_mute.rb
 - lib/HDLRuby/hruby_rsim_vcd.rb
 - lib/HDLRuby/hruby_serializer.rb
 - lib/HDLRuby/hruby_tools.rb