HDLRuby 2.11.12 → 3.1.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)
@@ -161,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}"
@@ -252,9 +252,10 @@ module HDLRuby::High
         end
     end
 
-    ##
-    # Enhance the signals 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}"
@@ -300,9 +301,10 @@ module HDLRuby::High
         end
     end
 
-    ##
-    # Enhance the Transmit class with VCD support.
+
     class Transmit
+        # Enhance the Transmit class with VCD support.
+
         ## Shows the hierarchy of the variables.
         def show_hierarchy(vcdout)
             # By default: nothing to do.
@@ -319,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.
@@ -339,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.
@@ -358,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.
@@ -378,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)
@@ -445,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.
@@ -502,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.
@@ -538,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_types.rb

@@ -42,13 +42,13 @@ module HDLRuby
             elsif type.float? then
                 return type
             elsif self.signed? then
-                return self
+                if type.signed? then
+                    return self.width >= type.width ? self : type
+                else
+                    return self
+                end
             elsif type.signed? then
                 return type
-            elsif self.unsigned? then
-                return self
-            elsif type.unsigned? then
-                return type
             elsif self.width >= type.width then
                 return self
             else

data/lib/HDLRuby/hruby_values.rb

@@ -56,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.
@@ -148,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)
@@ -240,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.
@@ -251,6 +253,7 @@ module HDLRuby
         # Cast to +type+.
         # NOTE: nodir tells if the direction is to be ignored.
         def cast(type,nodir = false)
+            # puts "cast with content=#{self.content} type.signed=#{type.signed?} type.width=#{type.width}"
             # Handle the direction.
             if !nodir && type.direction != self.type.direction then
                 if self.content.is_a?(Numeric) then
@@ -279,16 +282,18 @@ module HDLRuby
                     res_content.positive!
                 end
             end
-            # # truncs to the right size if necessary.
-            # if res_content.is_a?(BitString) then
-            #     res_content.trunc!(type.width)
-            # else 
-            #     res_content = self.trunc(res_content,type.width)
-            # end
+            if type.signed? && res_content.is_a?(Numeric) && res_content >= (1 << (type.width-1)) then
+                res_content = (-1 << type.width) + res_content
+            end
             # Generate the resulting value.
+            # puts "res_content=#{res_content}"
             return self.class.new(type,res_content)
         end
 
+        def as(typ)
+            return self.cast(typ)
+        end
+
         # Concat the content of +vals+.
         def self.concat(*vals)
             # Compute the resulting type.
@@ -405,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