HDLRuby 2.11.10 → 2.11.12

data/lib/HDLRuby/hruby_low.rb

@@ -850,6 +850,7 @@ module HDLRuby::Low
         
         # Adds inner signal +signal+.
         def add_inner(signal)
+            # puts "adding inner signal: #{signal.name}(#{signal})"
             # Check and add the signal.
             unless signal.is_a?(SignalI)
                 raise AnyError,
@@ -1632,6 +1633,112 @@ module HDLRuby::Low
 
         alias_method :each_deep, :each_type_deep
 
+        # Tells if the type signed.
+        def signed?
+            return @def.signed?
+        end
+
+        # Tells if the type is unsigned.
+        def unsigned?
+            return @def.unsigned?
+        end
+
+        # Tells if the type is fixed point.
+        def fixed?
+            return @def.fixed?
+        end
+
+        # Tells if the type is floating point.
+        def float?
+            return @def.float?
+        end
+
+        # Tells if the type is a leaf.
+        def leaf?
+            return @def.leaf?
+        end
+
+        # Tells if the type of of vector kind.
+        def vector?
+            return @def.vector?
+        end
+
+        # Gets the bitwidth of the type, by default 0.
+        # Bit, signed, unsigned and Float base have a width of 1.
+        def width
+            return @def.width
+        end
+
+        # Gets the type max value if any.
+        # Default: not defined.
+        def max
+            return @def.max
+        end
+
+        # Gets the type min value if any.
+        # Default: not defined.
+        def min
+            return @def.min
+        end
+
+        # Get the direction of the type, little or big endian.
+        def direction
+            return @def.direction
+        end
+
+        # Tells if the type has a range.
+        def range?
+            return @def.range?
+        end
+
+        # Gets the range of the type, by default range is not defined.
+        def range
+            return @def.range
+        end
+
+        # Tells if the type has a base.
+        def base?
+            return @def.base?
+        end
+
+        # Gets the base type, by default base type is not defined.
+        def base
+            return @def.base
+        end
+
+        # Tells if the type has sub types.
+        def types?
+            return @def.types?
+        end
+
+        # Tells if the type is regular (applies for tuples).
+        def regular?
+            return @def.regular?
+        end
+
+        # Tells if the type has named sub types.
+        def struct?
+            return @def.struct?
+        end
+
+        # Tells if the type is hierarchical.
+        def hierarchical?
+            return @def.hierarchical?
+        end
+
+        # Tell if +type+ is equivalent to current type.
+        #
+        # NOTE: type can be compatible while not being equivalent, please
+        #       refer to `hruby_types.rb` for type compatibility.
+        def equivalent?(type)
+            return @def.equivalent?(type)
+        end
+
+        # Converts to a bit vector.
+        def to_vector
+            return @def.to_vector
+        end
+
     end
 
 
@@ -1925,7 +2032,7 @@ module HDLRuby::Low
         def each(&ruby_block)
             # No ruby block? Return an enumerator.
             return to_enum(:each) unless ruby_block
-            # A ruby block? Apply it on each input signal instance.
+            # A ruby block? Apply it on each sub name/type pair.
             @types.each(&ruby_block)
         end
 
@@ -1935,7 +2042,7 @@ module HDLRuby::Low
         def each_type(&ruby_block)
             # No ruby block? Return an enumerator.
             return to_enum(:each_type) unless ruby_block
-            # A ruby block? Apply it on each input signal instance.
+            # A ruby block? Apply it on each sub type.
             @types.each(&ruby_block)
         end
 
@@ -2021,16 +2128,18 @@ module HDLRuby::Low
     ##
     # Describes a structure type.
     class TypeStruct < Type
-        # Creates a new structure type named +name+ with +direction+ and 
+        attr_reader :direction
+
+        # Creates a new structure type named +name+ with direction +dir+ and 
         # whose hierachy is given by +content+.
-        def initialize(name,direction,content)
+        def initialize(name,dir,content)
             # Initialize the type.
             super(name)
 
             # Set the direction.
-            @direction = direction.to_sym
+            @direction = dir.to_sym
             unless [:little, :big].include?(@direction)
-                raise AnyError, "Invalid direction for a type: #{direction}"
+                raise AnyError, "Invalid direction for a type: #{dir}"
             end
 
             # Check and set the content.
@@ -2046,7 +2155,8 @@ module HDLRuby::Low
         # Comparison for hash: structural comparison.
         def eql?(obj)
             # General type comparison.
-            return false unless super(obj)
+            # return false unless super(obj)
+            return false unless obj.is_a?(TypeStruct)
             # Specific comparison.
             idx = 0
             obj.each_key do |name|
@@ -2078,8 +2188,13 @@ module HDLRuby::Low
         end
 
         # Gets a sub type by +name+.
+        # NOTE: +name+ can also be an index.
         def get_type(name)
-            return @types[name.to_sym]
+            if name.respond_to?(:to_sym) then
+                return @types[name.to_sym]
+            else
+                return @types.values[name.to_i]
+            end
         end
 
         # Iterates over the sub name/type pair.
@@ -2088,7 +2203,7 @@ module HDLRuby::Low
         def each(&ruby_block)
             # No ruby block? Return an enumerator.
             return to_enum(:each) unless ruby_block
-            # A ruby block? Apply it on each input signal instance.
+            # A ruby block? Apply it on each sub name/type pair.
             @types.each(&ruby_block)
         end
 
@@ -2098,17 +2213,27 @@ module HDLRuby::Low
         def each_type(&ruby_block)
             # No ruby block? Return an enumerator.
             return to_enum(:each_type) unless ruby_block
-            # A ruby block? Apply it on each input signal instance.
+            # A ruby block? Apply it on each sub type.
             @types.each_value(&ruby_block)
         end
 
+        # Iterates over the keys.
+        #
+        # Returns an enumerator if no ruby block is given.
+        def each_key(&ruby_block)
+            # No ruby block? Return an enumerator.
+            return to_enum(:each_key) unless ruby_block
+            # A ruby block? Apply it on each key.
+            @types.each_key(&ruby_block)
+        end
+
         # Iterates over the sub type names.
         #
         # Returns an enumerator if no ruby block is given.
         def each_name(&ruby_block)
             # No ruby block? Return an enumerator.
             return to_enum(:each_name) unless ruby_block
-            # A ruby block? Apply it on each input signal instance.
+            # A ruby block? Apply it on each name.
             @types.each_key(&ruby_block)
         end
 
@@ -2128,7 +2253,11 @@ module HDLRuby::Low
         #
         # NOTE: must be redefined for specific types.
         def width
-            return @types.reduce(0) {|sum,type| sum + type.width }
+            if @types.is_a?(Array) then
+                return @types.reduce(0) {|sum,type| sum + type.width }
+            else
+                return @types.each_value.reduce(0) {|sum,type| sum + type.width }
+            end
         end
 
         # # Checks the compatibility with +type+
@@ -2506,8 +2635,9 @@ module HDLRuby::Low
                 end
                 @value = val
                 val.parent = self
-            else
-                @value = nil
+            # For memory optimization: no  initialization if not used.
+            # else
+            #     @value = nil
             end
         end
 
@@ -2517,6 +2647,40 @@ module HDLRuby::Low
             false
         end
 
+        # Adds sub signal +sig+
+        def add_signal(sig)
+            # puts "add sub=#{sig.name} in signal=#{self}"
+            # Sets the hash of sub signals if none.
+            @signals = HashName.new unless @signals
+            # Check and add the signal.
+            unless sig.is_a?(SignalI)
+                raise AnyError,
+                      "Invalid class for a signal instance: #{sig.class}"
+            end
+            # if @signals.include?(sig) then
+            #     raise AnyError, "SignalI #{sig.name} already present."
+            # end
+            # Set its parent.
+            sig.parent = self
+            # And add it
+            @signals.add(sig)
+        end
+
+        # Gets a sub signal by name.
+        def get_signal(name)
+            return @signals ? @signals[name] : nil
+        end
+
+        # Iterates over the sub signals.
+        #
+        # Returns an enumerator if no ruby block is given.
+        def each_signal(&ruby_block)
+            # No ruby block? Return an enumerator.
+            return to_enum(:each_signal) unless ruby_block
+            # A ruby block? Apply it on each sub signal instance if any.
+            @signals.each(&ruby_block) if @signals
+        end
+
         # # Add decorator capability (modifies intialize to put after).
         # include Hdecorator
 
@@ -4717,8 +4881,15 @@ module HDLRuby::Low
                         content.is_a?(HDLRuby::BitString)
                     # content = HDLRuby::BitString.new(content.to_s)
                     content = content.to_s
-                    if self.type.unsigned? && content[0] != 0 then
-                        content = "0" + content.rjust(self.type.width,content[0])
+                    if self.type.unsigned? && content[0] != "0" then
+                        # content = "0" + content.rjust(self.type.width,content[0])
+                        if content[0] == "1" then
+                            # Do not extend the 1, but 0 instead.
+                            content = "0" + content.rjust(self.type.width,"0")
+                        else
+                            # But extend the other.
+                            content = "0" + content.rjust(self.type.width,content[0])
+                        end
                     end
                     content = HDLRuby::BitString.new(content)
                 end

data/lib/HDLRuby/hruby_low2c.rb

@@ -641,12 +641,10 @@ module HDLRuby::Low
         # +level+ is the hierachical level of the object.
         # def to_c(level = 0)
         def to_c(res,level = 0)
-            # return "get_type_struct(#{self.each.join(",") do |key,type|
-            #     "\"#{key.to_s}\",#{type.to_c(level+1)}"
-            # end})"
-            res << "get_type_struct(#{self.each.join(",") do |key,type|
-                "\"#{key.to_s}\",#{type.to_c("",level+1)}"
-            end})"
+            # res << "get_type_struct(#{self.each.map do |key,type|
+            #     "\"#{key.to_s}\",#{type.to_c("",level+1)}"
+            # end.join(",")})"
+            self.to_vector.to_c(res,level)
             return res
         end
     end
@@ -897,8 +895,17 @@ module HDLRuby::Low
         #  +level+ is the hierachical level of the object.
         # def to_c(level = 0)
         def to_c(res,level = 0)
+            # First generate the sub signals if any.
+            if self.each_signal.any? then
+                self.each_signal do |signal|
+                    signal.to_c(res,level)
+                end
+                # return res
+            end
 
-            # puts "Signal.to_c with name: #{Low2C.obj_name(self)}"
+            # No sub signals, generate for the current one.
+
+            # puts "Signal.to_c with signal #{self.name} and c_name: #{Low2C.obj_name(self)}"
             # Declare the global variable holding the signal.
             res << "SignalI "
             self.to_c_signal(res,level+1)
@@ -943,6 +950,22 @@ module HDLRuby::Low
             res << "signalI->type = "
             self.type.to_c(res,level+2)
             res << ";\n"
+
+            # Generate and set the sub signals if any.
+            res << " " * (level+1)*3
+            num_sig = self.each_signal.to_a.size
+            res << "signalI->num_signals = #{num_sig};\n"
+            if num_sig > 0 then
+                res << " " * (level+1)*3
+                res << "signalI->signals = calloc(sizeof(SignalI),#{num_sig});\n"
+                self.each_signal.with_index do |sig,i|
+                    res << " " * (level+1)*3
+                    res << "#{Low2C.obj_name(sig)} = #{Low2C.make_name(sig)}();\n"
+                    res << " " * (level+1)*3
+                    res << "signalI->signals[#{i}] = #{Low2C.obj_name(sig)};\n"
+                end
+            end
+
             # Set the current and the next value.
             res << " " * (level+1)*3
             res << "signalI->c_value = make_value(signalI->type,0);\n"
@@ -1000,6 +1023,15 @@ module HDLRuby::Low
         ## Generates the content of the h file.
         # def to_ch
         def to_ch(res)
+            # First generate the sub signals if any.
+            if self.each_signal.any? then
+                self.each_signal do |signal|
+                    signal.to_ch(res)
+                end
+                # return res
+            end
+
+            # No sub sub signal, generate for the current signal.
             # res = ""
             # puts "to_ch for SignalI: #{self.to_c_signal()}"
             # Declare the global variable holding the signal.
@@ -2205,7 +2237,7 @@ module HDLRuby::Low
                         res << "value->data_int = #{self.content}LLU;\n"
                     else
                         res << "value->data_int = "
-                        res << "#{self.content & 0xFFFFFFFFFFFF}LLU;\n"
+                        res << "#{self.content & 0xFFFF_FFFF_FFFF_FFFF}LLU;\n"
                     end
                     # Close the value.
                     res << " " * (level+1)*3
@@ -2697,7 +2729,7 @@ module HDLRuby::Low
             end
             # Compute the resulting concatenation.
             res << (" " * ((level+1)*3))
-            # puts "self.type.direction=#{self.type.direction}\n"
+            # puts "self.type=#{self.type} self.type.direction=#{self.type.direction}\n"
             res << "sconcat(#{expressions.size},"
             res << (self.type.direction == :little ? "1" : "0")
             res << ");\n"
@@ -3054,14 +3086,42 @@ module HDLRuby::Low
             res << "->" << (left ? "f_value" : "c_value")
             res << ");\n"
             return res
+            # sig = self.resolve
+            # if sig.each_signal.any? then
+            #     # Save the value pool state.
+            #     res << (" " * (level*3)) << "PV;\n"
+            #     # There are sub signals, get and concat their values.
+            #     subs = sig.each_signal.to_a
+            #     subs.each do |sub|
+            #         res << (" " * (level*3))
+            #         res << "push("
+            #         sub.to_c_signal(res,level+1)
+            #         res << "->" << (left ? "f_value" : "c_value")
+            #         res << ");\n"
+            #     end
+            #     # Compute the resulting concatenation.
+            #     res << (" " * ((level+1)*3))
+            #     res << "sconcat(#{subs.size},"
+            #     res << (sig.type.direction == :little ? "1" : "0")
+            #     res << ");\n"
+            #     # Restore the value pool state.
+            #     res << (" " * (level*3)) << "RV;\n"
+            # else
+            #     # There is no sub signals, get the signal value.
+            #     res << (" " * (level*3))
+            #     res << "push("
+            #     sig.to_c_signal(res,level+1)
+            #     res << "->" << (left ? "f_value" : "c_value")
+            #     res << ");\n"
+            # end
+            # return res
         end
 
         # Generates the C text for reference as left value to a signal.
         # +level+ is the hierarchical level of the object.
         # def to_c_signal(level = 0)
         def to_c_signal(res,level = 0)
-            # puts "to_c_signal with self=#{self.name}, resolve=#{self.resolve}"
-            # return "#{self.resolve.to_c_signal(level+1)}"
+            # puts "to_c_signal with self=#{self.name}"
             self.resolve.to_c_signal(res,level+1)
             return res
         end

data/lib/HDLRuby/hruby_low2vhd.rb

@@ -807,7 +807,8 @@ module HDLRuby::Low
             res << " " * (level*3)
             res << "begin\n"
             # Generate the edges if any.
-            if self.each_event.find {|event| event.type != :change} then
+            # if self.each_event.find {|event| event.type != :change} then
+            if self.each_event.find {|event| event.type != :anyedge} then
                 # Generate the edge test.
                 level = level + 1
                 res << " " * (level*3)

data/lib/HDLRuby/hruby_low_fix_types.rb

@@ -389,6 +389,7 @@ module HDLRuby::Low
                 # No, recurse on the sub expressions.
                 return RefConcat.new(self.type,self.each_ref.map.with_index do
                     |ref,i| 
+                    puts "self.type=#{self.type}"
                     ref.explicit_types(self.type.get_type(i))
                 end)
             end

data/lib/HDLRuby/hruby_low_mutable.rb

@@ -600,6 +600,9 @@ module HDLRuby::Low
             right.parent = self unless right.parent
         end
 
+        alias_method :map_expressions!, :map_nodes!
+
+
         # Replaces sub expressions using +node2rep+ table indicating the
         # node to replace and the corresponding replacement.
         # Returns the actually replaced nodes and their corresponding
@@ -908,6 +911,10 @@ module HDLRuby::Low
         # Sets the default.
         def set_default!(default)
             # Checks and set the default case if any.
+            if self.default then
+                # There is a default first detach it.
+                @default = nil
+            end
             self.default = default
         end
 
@@ -1172,7 +1179,11 @@ module HDLRuby::Low
                 raise AnyError, "Invalid type for a statement: #{stmnt.class}"
             end
             idx = @statements.index(org)
-            @statements[idx] = stmnt if idx
+            # @statements[idx] = stmnt if idx
+            if idx then
+                @statements[idx] = stmnt
+                stmnt.parent = self unless stmnt.parent
+            end
         end
 
         # Maps on the statements.
@@ -1403,6 +1414,8 @@ module HDLRuby::Low
             @child.parent = self unless @child.parent
         end
 
+        alias_method :map_expressions!, :map_nodes!
+
         # Replaces sub expressions using +node2rep+ table indicating the
         # node to replace and the corresponding replacement.
         # Returns the actually replaced nodes and their corresponding
@@ -1507,6 +1520,8 @@ module HDLRuby::Low
             @right.parent = self unless @right.parent
         end
 
+        alias_method :map_expressions!, :map_nodes!
+
         # Replaces sub expressions using +node2rep+ table indicating the
         # node to replace and the corresponding replacement.
         # Returns the actually replaced nodes and their corresponding
@@ -1590,6 +1605,8 @@ module HDLRuby::Low
             map_choices!(&ruby_block)
         end
 
+        alias_method :map_expressions!, :map_nodes!
+
         # Replaces sub expressions using +node2rep+ table indicating the
         # node to replace and the corresponding replacement.
         # Returns the actually replaced nodes and their corresponding
@@ -1707,6 +1724,8 @@ module HDLRuby::Low
         def map_nodes!(&ruby_block)
             # Nothing to do.
         end
+
+        alias_method :map_expressions!, :map_nodes!
     end
 
 
@@ -1775,6 +1794,8 @@ module HDLRuby::Low
             @ref.parent = self unless @ref.parent
         end
 
+        alias_method :map_expressions!, :map_nodes!
+
         # Replaces sub expressions using +node2rep+ table indicating the
         # node to replace and the corresponding replacement.
         # Returns the actually replaced nodes and their corresponding
@@ -1856,6 +1877,8 @@ module HDLRuby::Low
             @ref.parent = self unless @ref.parent
         end
 
+        alias_method :map_expressions!, :map_nodes!
+
         # Replaces sub expressions using +node2rep+ table indicating the
         # node to replace and the corresponding replacement.
         # Returns the actually replaced nodes and their corresponding
@@ -1934,6 +1957,8 @@ module HDLRuby::Low
             @ref.parent = self unless @ref.parent
         end
 
+        alias_method :map_expressions!, :map_nodes!
+
         # Replaces sub expressions using +node2rep+ table indicating the
         # node to replace and the corresponding replacement.
         # Returns the actually replaced nodes and their corresponding
@@ -1970,6 +1995,8 @@ module HDLRuby::Low
         def map_nodes!(&ruby_block)
             # Nothing to do.
         end
+
+        alias_method :map_expressions!, :map_nodes!
     end
 
     ##
@@ -1991,5 +2018,7 @@ module HDLRuby::Low
         def map_nodes!(&ruby_block)
             self.map_args!(&ruby_block)
         end
+
+        alias_method :map_expressions!, :map_nodes!
     end
 end

data/lib/HDLRuby/hruby_low_resolve.rb

@@ -109,6 +109,20 @@ module HDLRuby::Low
     end
 
 
+    ##
+    #  Extends SignalI with the capability of finding one of its inner object
+    #  by name.
+    class SignalI
+        
+        ## Find an inner object by +name+.
+        #  NOTE: return nil if not found.
+        def get_by_name(name)
+            return self.get_signal(name)
+        end
+    end
+
+
+
     ##
     #  Extends RefIndex with the capability of finding the object it
     #  refered to.
@@ -219,10 +233,9 @@ module HDLRuby::Low
         #  corresponding object.
         #  NOTE: return nil if could not resolve.
         def resolve
-            # puts "Resolve with #{self} and name=#{self.name}"
+            # puts "Resolve with #{self} and name=#{self.name} and ref=#{self.ref.class}"
             # First resolve the sub reference if possible.
             if self.ref.is_a?(RefName) then
-                # puts "ref name=#{self.ref.name}"
                 obj = self.ref.resolve
                 # puts "obj=#{obj}"
                 # Look into the object for the name.