HDLRuby 2.11.11 → 3.0.0

data/lib/HDLRuby/hruby_rsim_vcd.rb

@@ -40,9 +40,9 @@ module HDLRuby::High
         return idstr
     end
 
-    ##
-    # Enhance the system type class with VCD support.
+
     class SystemT
+        # Enhance the system type class with VCD support.
 
         ## Initializes the displayer for generating a vcd on +vcdout+
         def show_init(vcdout)
@@ -94,9 +94,10 @@ module HDLRuby::High
 
         ## Gets the VCD variables with their long name.
         def get_vars_with_fullname(vars_with_fullname = {})
-            # Adds the signals of the interface of the system.
+            # Recurse on the signals.
             self.each_signal do |sig|
-                vars_with_fullname[sig] = HDLRuby::High.vcd_name(sig.fullname)
+                sig.get_vars_with_fullname(vars_with_fullname)
+                # vars_with_fullname[sig] = HDLRuby::High.vcd_name(sig.fullname)
             end
             # Recurse on the scope.
             return self.scope.get_vars_with_fullname(vars_with_fullname)
@@ -104,9 +105,13 @@ module HDLRuby::High
 
         ## 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.
+            # # 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 signals.
             self.each_signal do |sig|
-                vars_with_idstr[sig] = HDLRuby::High.vcd_idstr(sig)
+                sig.get_vars_with_idstr(vars_with_idstr)
             end
             # Recurse on the scope.
             return self.scope.get_vars_with_idstr(vars_with_idstr)
@@ -119,11 +124,11 @@ module HDLRuby::High
             vcdout << "$scope module #{HDLRuby::High.vcd_name(self.name)} $end\n"
             # Shows the interface signals.
             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_idstr(sig)} "
-                vcdout << "#{HDLRuby::High.vcd_name(sig.name)} $end\n"
+                sig.show_hierarchy(vcdout)
+                # # puts "showing signal #{HDLRuby::High.vcd_name(sig.fullname)}"
+                # vcdout << "$var wire #{sig.type.width} "
+                # vcdout << "#{HDLRuby::High.vcd_idstr(sig)} "
+                # vcdout << "#{HDLRuby::High.vcd_name(sig.name)} $end\n"
             end
             # Recurse on the scope.
             self.scope.show_hierarchy(vcdout)
@@ -156,9 +161,9 @@ module HDLRuby::High
     end
 
 
-    ##
-    # Enhance the scope class with VCD support.
     class Scope
+        # Enhance the scope class with VCD support.
+
         ## Shows the hierarchy of the variables.
         def show_hierarchy(vcdout)
             # puts "show_hierarchy for scope=#{self}"
@@ -170,11 +175,12 @@ module HDLRuby::High
             end
             # Shows the inner signals.
             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_idstr(sig)} "
-                vcdout << "#{HDLRuby::High.vcd_name(sig.name)} $end\n"
+                sig.show_hierarchy(vcdout)
+                # # 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_idstr(sig)} "
+                # vcdout << "#{HDLRuby::High.vcd_name(sig.name)} $end\n"
             end
             # Recurse on the behaviors' blocks
             self.each_behavior do |beh|
@@ -196,9 +202,14 @@ module HDLRuby::High
 
         ## Gets the VCD variables with their long name.
         def get_vars_with_fullname(vars_with_fullname = {})
-            # Adds the inner signals.
+            # # Adds the inner signals.
+            # self.each_inner do |sig|
+            #     vars_with_fullname[sig] = HDLRuby::High.vcd_name(sig.fullname)
+            # end
+            # Recurse on the inner signals.
             self.each_inner do |sig|
-                vars_with_fullname[sig] = HDLRuby::High.vcd_name(sig.fullname)
+                sig.get_vars_with_fullname(vars_with_fullname)
+                # vars_with_fullname[sig] = HDLRuby::High.vcd_name(sig.fullname)
             end
             # Recurse on the behaviors' blocks
             self.each_behavior do |beh|
@@ -217,9 +228,13 @@ module HDLRuby::High
 
         ## Gets the VCD variables with their id string.
         def get_vars_with_idstr(vars_with_idstr = {})
-            # Adds the inner signals.
+            # # Adds the inner signals.
+            # self.each_inner do |sig|
+            #     vars_with_idstr[sig] = HDLRuby::High.vcd_idstr(sig)
+            # end
+            # Recurse on the inner signals.
             self.each_inner do |sig|
-                vars_with_idstr[sig] = HDLRuby::High.vcd_idstr(sig)
+                sig.get_vars_with_idstr(vars_with_idstr)
             end
             # Recurse on the behaviors' blocks
             self.each_behavior do |beh|
@@ -238,9 +253,58 @@ module HDLRuby::High
     end
 
 
-    ##
-    # Enhance the Transmit class with VCD support.
+    module SimSignal
+        # Enhance the signals class with VCD support.
+
+        ## Shows the hierarchy of the variables.
+        def show_hierarchy(vcdout)
+            # puts "show_hierarcy for signal=#{self.name}"
+            if self.each_signal.any? then
+                # The signal is hierarchical, recurse on the sub signals.
+                vcdout << "$scope module #{HDLRuby::High.vcd_name(self.name)} $end\n"
+                self.each_signal { |sig| sig.show_hierarchy(vcdout) }
+                vcdout << "$upscope $end\n"
+            else
+                # This is a signal to show.
+                vcdout << "$var wire #{self.type.width} "
+                vcdout << "#{HDLRuby::High.vcd_idstr(self)} "
+                vcdout << "#{HDLRuby::High.vcd_name(self.name)} $end\n"
+            end
+        end
+
+        ## Gets the VCD variables with their long name.
+        def get_vars_with_fullname(vars_with_fullname = {})
+            if self.each_signal.any? then
+                # There are sub signals, recurse on them.
+                self.each_signal do |sig|
+                    sig.get_vars_with_fullname(vars_with_fullname)
+                end
+            else
+                # No add the current signal.
+                vars_with_fullname[self] = HDLRuby::High.vcd_name(self.fullname)
+            end
+            return vars_with_full_name
+        end
+
+        ## Gets the VCD variables with their id string.
+        def get_vars_with_idstr(vars_with_idstr = {})
+            if self.each_signal.any? then
+                # There are sub signals, recurse on them.
+                self.each_signal do |sig|
+                    sig.get_vars_with_idstr(vars_with_idstr)
+                end
+            else
+                # No add the current signal.
+                vars_with_idstr[self] = HDLRuby::High.vcd_idstr(self)
+            end
+            return vars_with_idstr
+        end
+    end
+
+
     class Transmit
+        # Enhance the Transmit class with VCD support.
+
         ## Shows the hierarchy of the variables.
         def show_hierarchy(vcdout)
             # By default: nothing to do.
@@ -257,9 +321,10 @@ module HDLRuby::High
         end
     end
 
-    ##
-    # Enhance the TimeRepeat class with VCD support.
+
     class TimeRepeat
+        # Enhance the TimeRepeat class with VCD support.
+        
         ## Shows the hierarchy of the variables.
         def show_hierarchy(vcdout)
             # Recurse on the statement.
@@ -277,9 +342,10 @@ module HDLRuby::High
         end
     end
 
-    ##
-    # Enhance the TimeWait class with VCD support.
+
     class TimeWait
+        # Enhance the TimeWait class with VCD support.
+
         ## Shows the hierarchy of the variables.
         def show_hierarchy(vcdout)
             # By default: nothing to do.
@@ -296,9 +362,10 @@ module HDLRuby::High
         end
     end
 
-    ##
-    # Enhance the Print class with VCD support.
+
     class Print
+        # Enhance the Print class with VCD support.
+
         ## Shows the hierarchy of the variables.
         def show_hierarchy(vcdout)
             # By default: nothing to do.
@@ -316,7 +383,7 @@ module HDLRuby::High
     end
 
 
-    ## Module adding show_hierarchyto block objects.
+    ## Module adding show_hierarchy to block objects.
     module BlockHierarchy
         ## Shows the hierarchy of the variables.
         def show_hierarchy(vcdout)
@@ -329,11 +396,12 @@ module HDLRuby::High
             end
             # Shows the inner signals.
             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_idstr(sig)} "
-                vcdout << "#{HDLRuby::High.vcd_name(sig.name)} $end\n"
+                sig.show_hierarchy(vcdout)
+                # # 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_idstr(sig)} "
+                # vcdout << "#{HDLRuby::High.vcd_name(sig.name)} $end\n"
             end
             # Recurse on the statements
             self.each_statement do |stmnt|
@@ -347,9 +415,14 @@ module HDLRuby::High
 
         ## Gets the VCD variables with their long name.
         def get_vars_with_fullname(vars_with_fullname = {})
-            # Adds the inner signals.
+            # # Adds the inner signals.
+            # self.each_inner do |sig|
+            #     vars_with_fullname[sig] = HDLRuby::High.vcd_name(sig.fullname)
+            # end
+            # Recurse on the inner signals.
             self.each_inner do |sig|
-                vars_with_fullname[sig] = HDLRuby::High.vcd_name(sig.fullname)
+                sig.get_vars_with_fullname(vars_with_fullname)
+                # vars_with_fullname[sig] = HDLRuby::High.vcd_name(sig.fullname)
             end
             # Recurse on the statements.
             self.each_statement do |stmnt|
@@ -360,9 +433,13 @@ module HDLRuby::High
 
         ## Gets the VCD variables with their id string.
         def get_vars_with_idstr(vars_with_idstr = {})
-            # Adds the inner signals.
+            # # Adds the inner signals.
+            # self.each_inner do |sig|
+            #     vars_with_idstr[sig] = HDLRuby::High.vcd_idstr(sig)
+            # end
+            # Recurse on the inner signals.
             self.each_inner do |sig|
-                vars_with_idstr[sig] = HDLRuby::High.vcd_idstr(sig)
+                sif.get_vars_with_idstr(vars_with_idstr)
             end
             # Recurse on the statements.
             self.each_statement do |stmnt|
@@ -373,23 +450,20 @@ module HDLRuby::High
     end
 
 
-    ##
-    # Enhance the block class with VCD support.
     class Block
+        # Enhance the block class with VCD support.
         include HDLRuby::High::BlockHierarchy
     end
 
 
-    ##
-    # Enhance the block class with VCD support.
     class TimeBlock
+        # Enhance the block class with VCD support.
         include HDLRuby::High::BlockHierarchy
     end
 
 
-    ##
-    # Enhance the if class with VCD support.
     class If
+        # Enhance the if class with VCD support.
         ## Shows the hierarchy of the variables.
         def show_hierarchy(vcdout)
             # Recurse on the yes.
@@ -430,9 +504,9 @@ module HDLRuby::High
     end
 
 
-    ##
-    # Enhance the Case class with VCD support.
     class Case
+        # Enhance the Case class with VCD support.
+        
         ## Shows the hierarchy of the variables.
         def show_hierarchy(vcdout)
             # Recurse on each when.
@@ -466,9 +540,10 @@ module HDLRuby::High
         end
     end
 
-    ##
-    # Enhance the TimeRepeat class with VCD support.
+
     class TimeRepeat
+        # Enhance the TimeRepeat class with VCD support.
+        
         ## Shows the hierarchy of the variables.
         def show_hierarchy(vcdout)
             # Recurse on the statement.

data/lib/HDLRuby/hruby_values.rb

@@ -13,6 +13,9 @@ module HDLRuby
 
         # Truncs integer +val+ to +width+
         def trunc(val,width)
+            if val.is_a?(BitString) then
+                return val[(width-1)..0]
+            end
             if val.bit_length > width then
                 if val >= 0 then
                     # return val & (2**width-1)
@@ -38,8 +41,9 @@ module HDLRuby
                 unless val.to_value? then
                     # Not computable, use the former method that generates
                     # HDLRuby code.
-                    return self.send(orig_operator(op),value)
+                    return self.send(orig_operator(op),val)
                 end
+                val = val.to_value unless val.is_a?(Value)
                 # Handle Numeric op BitString case.
                 if self.content.is_a?(Numeric) && val.content.is_a?(BitString)
                     if val.content.specified? then
@@ -52,7 +56,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.to_i}) val.content=#{val.content} (#{val.content.to_i}) res_content=#{res_content} (#{res_content.class})" if op == :^
+                    # 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})"
                 end
                 res_type = self.type.resolve(val.type)
                 # # Adjust the result content size.
@@ -80,27 +84,29 @@ module HDLRuby
                     return self.send(orig_operator(op),val)
                 end
                 # Process left.
-                # unless left.is_a?(Numeric) || left.is_a?(BitString) then
-                #     left = left.to_value.content
-                # end
-                left = left.content
-                if left.is_a?(BitString) && !left.specified? then
-                    return self.class.new(self.type.base,
-                                          BitString::UNKNOWN.clone)
+                if left.is_a?(Value) then
+                    left = left.content
+                    if left.is_a?(BitString) && !left.specified? then
+                        return self.class.new(self.type.base,
+                                              BitString::UNKNOWN.clone)
+                    end
+                    # left = left.to_i
+                    left = self.trunc(left.to_i,val.first.type.width)
+                else
+                    left = left.to_i
                 end
-                # left = left.to_i
-                left = self.trunc(left.to_i,val.first.type.width)
                 # Process right.
-                # unless right.is_a?(Numeric) || right.is_a?(BitString) then
-                #     right = right.to_value.content
-                # end
-                right = right.content
-                if right.is_a?(BitString) && !right.specified? then
-                    return self.class.new(self.type.base,
-                                          BitString::UNKNOWN.clone)
+                if right.is_a?(Value) then
+                    right = right.content
+                    if right.is_a?(BitString) && !right.specified? then
+                        return self.class.new(self.type.base,
+                                              BitString::UNKNOWN.clone)
+                    end
+                    # right = right.to_i
+                    right = self.trunc(right.to_i,val.last.type.width)
+                else
+                    right = right.to_i
                 end
-                # right = right.to_i
-                right = self.trunc(right.to_i,val.last.type.width)
                 # Generate the resulting type.
                 res_type = self.type.base[(left-right+1).abs]
                 # Generate the resulting value.
@@ -124,18 +130,16 @@ module HDLRuby
                     return self.send(orig_operator(op),val)
                 end
                 # Process val.
-                index = val.content
-                if index.is_a?(BitString) && !index.specified? then
-                    return self.class.new(self.type.base,
-                                          BitString::UNKNOWN.clone)
+                if val.is_a?(Value) then
+                    index = val.content
+                    if index.is_a?(BitString) && !index.specified? then
+                        return self.class.new(self.type.base,
+                                              BitString::UNKNOWN.clone)
+                    end
+                    index = self.trunc(index.to_i,val.type.width)
+                else
+                    index = val.to_i
                 end
-                index = self.trunc(index.to_i,val.type.width)
-                # index = index.to_i
-                # if index >= self.type.size then
-                #     # puts "index=#{index}"
-                #     index %= self.type.size
-                #     # puts "now index=#{index}"
-                # end
                 # Generate the resulting type.
                 res_type = self.type.base
                 # Generate the resulting value.
@@ -144,9 +148,11 @@ module HDLRuby
                 if self.content.is_a?(BitString) then
                     res_content = self.content[index*width..(index+1)*width-1]
                 else
+                    # puts "self.content=#{self.content} index=#{index}"
                     sh = index*width
                     mask = (-1 << sh) & ~(-1 << (index+1)*width)
                     res_content = (self.content & mask) >> sh
+                    # puts "res_content=#{res_content}"
                 end
                 # Return the resulting value.
                 return self.class.new(res_type,res_content)
@@ -236,7 +242,7 @@ module HDLRuby
                 # Generate the resulting type.
                 res_type = self.type
                 # Generate the resulting content.
-                # puts "op=#{op} content=#{content.to_s}"
+                # puts "op=#{op} content=#{content.to_s} width=#{res_type.width}"
                 res_content = self.content.send(op)
                 # puts "res_content=#{res_content}"
                 # Return the resulting value.
@@ -275,6 +281,9 @@ module HDLRuby
                     res_content.positive!
                 end
             end
+            if type.signed && res_content.is_a?(Numeric) && res_content >= (1 << (type.width-1)) then
+                res_content = (-1 << type.width) + res_content
+            end
             # # truncs to the right size if necessary.
             # if res_content.is_a?(BitString) then
             #     res_content.trunc!(type.width)
@@ -308,7 +317,7 @@ module HDLRuby
                         break if count == width
                     end
                     if count < width then
-                        res_content.concat(res_content[-1] * (width-count))
+                        res_content.concat([res_content[-1]] * (width-count))
                     end
                 else
                     width.times do |p|
@@ -401,6 +410,12 @@ module HDLRuby
             end
         end
 
+        # Tell if the value is high impedance.
+        def impedence?
+            return false unless @content.is_a?(BitString)
+            return @content.raw_content.include?(2)
+        end
+
         ## Converts the value to a string of the right size.
         def to_vstr
             if self.content.is_a?(Numeric) then