HDLRuby 2.10.3 → 2.11.0

data/lib/HDLRuby/hruby_high_fullname.rb

@@ -0,0 +1,82 @@
+require "HDLRuby/hruby_high"
+
+
+
+module HDLRuby::High
+
+##
+# Library for describing adding the fullname method to HDLRuby::High objects.
+#
+########################################################################
+
+    class SystemT
+
+        ## Returns the name of the signal with its hierarchy.
+        def fullname
+            @fullname ||= (self.parent ? self.parent.fullname + ":" : "") + 
+                self.name.to_s
+            return @fullname
+        end
+    end
+
+
+    ##
+    # Module for extending named classes with fullname (other than SystemT).
+    module WithFullname
+
+        ## Returns the name of the signal with its hierarchy.
+        def fullname
+            @fullname ||= self.parent.fullname + ":" + self.name.to_s
+            return @fullname
+        end
+
+    end
+
+    class Scope
+        include WithFullname
+    end
+
+
+    class Behavior
+
+        ## Returns the name of the signal with its hierarchy.
+        def fullname
+            return self.parent.fullname
+        end
+    end
+
+
+    class TimeBehavior
+
+        ## Returns the name of the signal with its hierarchy.
+        def fullname
+            return self.parent.fullname
+        end
+    end
+
+
+    class SignalI
+        include WithFullname
+    end
+
+    class SignalC
+        include WithFullname
+    end
+
+    class SystemI
+        include WithFullname
+    end
+
+    class Code
+        # TODO
+    end
+
+    class Block
+        include WithFullname
+    end
+
+    class TimeBlock
+        include WithFullname
+    end
+
+end

data/lib/HDLRuby/hruby_low.rb

@@ -57,6 +57,11 @@ module HDLRuby::Low
             end
         end
 
+        # Clears the parent.
+        def no_parent!
+            @parent = nil
+        end
+
         # Get the parent scope.
         def scope
             cur = self.parent
@@ -190,14 +195,22 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a signal instance: #{signal.class}"
             end
+            # if @inputs.include?(signal) then
+            #     raise AnyError, "SignalI #{signal.name} already present."
+            # end
             if @inputs.include?(signal) then
-                raise AnyError, "SignalI #{signal.name} already present."
+                signal.parent = self
+                # Replace the signal.
+                old_signal = @inputs[signal.name]
+                @inputs.add(signal)
+                @interface[@interface.index(old_signal)] = signal
+            else
+                # Set the parent of the signal.
+                signal.parent = self
+                # And add the signal.
+                @inputs.add(signal)
+                @interface << signal
             end
-            # Set the parent of the signal.
-            signal.parent = self
-            # And add the signal.
-            @inputs.add(signal)
-            @interface << signal
             return signal
         end
 
@@ -208,14 +221,22 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a signal instance: #{signal.class}"
             end
+            # if @outputs.include?(signal) then
+            #     raise AnyError, "SignalI #{signal.name} already present."
+            # end
             if @outputs.include?(signal) then
-                raise AnyError, "SignalI #{signal.name} already present."
+                signal.parent = self
+                # Replace the signal.
+                old_signal = @outputs[signal.name]
+                @outputs.add(signal)
+                @interface[@interface.index(old_signal)] = signal
+            else
+                # Set the parent of the signal.
+                signal.parent = self
+                # And add the signal.
+                @outputs.add(signal)
+                @interface << signal
             end
-            # Set the parent of the signal.
-            signal.parent = self
-            # And add the signal.
-            @outputs.add(signal)
-            @interface << signal
             return signal
         end
 
@@ -226,14 +247,22 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a signal instance: #{signal.class}"
             end
+            # if @inouts.include?(signal) then
+            #     raise AnyError, "SignalI #{signal.name} already present."
+            # end
             if @inouts.include?(signal) then
-                raise AnyError, "SignalI #{signal.name} already present."
+                signal.parent = self
+                # Replace the signal.
+                old_signal = @inouts[signal.name]
+                @inouts.add(signal)
+                @interface[@interface.index(old_signal)] = signal
+            else
+                # Set the parent of the signal.
+                signal.parent = self
+                # And add the signal.
+                @inouts.add(signal)
+                @interface << signal
             end
-            # Set the parent of the signal.
-            signal.parent = self
-            # And add the signal.
-            @inouts.add(signal)
-            @interface << signal
             return signal
         end
 
@@ -571,9 +600,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a system type: #{systemT.class}"
             end
-            if @systemTs.include?(systemT) then
-                raise AnyError, "SystemT #{systemT.name} already present."
-            end
+            # if @systemTs.include?(systemT) then
+            #     raise AnyError, "SystemT #{systemT.name} already present."
+            # end
             # Set the parent of the instance
             systemT.parent = self
             # puts "systemT = #{systemT}, parent=#{self}"
@@ -623,9 +652,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a type: #{type.class}"
             end
-            if @types.include?(type) then
-                raise AnyError, "Type #{type.name} already present."
-            end
+            # if @types.include?(type) then
+            #     raise AnyError, "Type #{type.name} already present."
+            # end
             # Set the parent of the instance
             type.parent = self
             # puts "type = #{type}, parent=#{self}"
@@ -676,12 +705,14 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a system instance: #{scope.class}"
             end
-            if @scopes.include?(scope) then
-                raise AnyError, "Scope #{scope} already present."
-            end
+            # if @scopes.include?(scope) then
+            #     raise AnyError, "Scope #{scope} already present."
+            # end
             # Set the parent of the scope
             scope.parent = self
-            # Add the instance
+            # Remove a former scope with same name if present (override)
+            @scopes.delete_if { |sc| sc.name && sc.name == scope.name }
+            # Add the scope
             @scopes << scope
         end
 
@@ -732,9 +763,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a system instance: #{systemI.class}"
             end
-            if @systemIs.include?(systemI) then
-                raise AnyError, "SystemI #{systemI.name} already present."
-            end
+            # if @systemIs.include?(systemI) then
+            #     raise AnyError, "SystemI #{systemI.name} already present."
+            # end
             # Set the parent of the instance
             systemI.parent = self
             # puts "systemI = #{systemI}, parent=#{self}"
@@ -783,9 +814,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a non-hDLRuby code chunk: #{code.class}"
             end
-            if @codes.include?(code) then
-                raise AnyError, "Code #{code.name} already present."
-            end
+            # if @codes.include?(code) then
+            #     raise AnyError, "Code #{code.name} already present."
+            # end
             # Set the parent of the code chunk.
             code.parent = self
             # puts "code = #{code}, parent=#{self}"
@@ -824,11 +855,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a signal instance: #{signal.class}"
             end
-            # if @inners.has_key?(signal.name) then
-            if @inners.include?(signal) then
-                raise AnyError, "SignalI #{signal.name} already present."
-            end
-            # @inners[signal.name] = signal
+            # if @inners.include?(signal) then
+            #     raise AnyError, "SignalI #{signal.name} already present."
+            # end
             # Set the parent of the signal.
             signal.parent = self
             # And add the signal.
@@ -1432,6 +1461,10 @@ module HDLRuby::Low
     # The bit type leaf.
     class << ( Bit = Type.new(:bit) )
         include LLeaf
+        # Tells if the type is unsigned.
+        def unsigned?
+            return true
+        end
         # Tells if the type fixed point.
         def fixed?
             return true
@@ -1573,10 +1606,11 @@ module HDLRuby::Low
 
         # Comparison for hash: structural comparison.
         def eql?(obj)
-            # General type comparison.
-            return false unless super(obj)
+            # # General type comparison.
+            # return false unless super(obj)
             # Specific comparison.
             return false unless obj.is_a?(TypeDef)
+            return false unless @name.eql?(obj.name)
             return false unless @def.eql?(obj.def)
             return true
         end
@@ -1651,8 +1685,8 @@ module HDLRuby::Low
 
         # Comparison for hash: structural comparison.
         def eql?(obj)
-            # General type comparison.
-            return false unless super(obj)
+            # # General type comparison.
+            # return false unless super(obj)
             # Specific comparison.
             return false unless obj.is_a?(TypeVector)
             return false unless @base.eql?(obj.base)
@@ -1843,8 +1877,9 @@ module HDLRuby::Low
 
         # Comparison for hash: structural comparison.
         def eql?(obj)
-            # General type comparison.
-            return false unless super(obj)
+            # # General type comparison.
+            # return false unless super(obj)
+            return false unless obj.is_a?(TypeTuple)
             # Specific comparison.
             idx = 0
             obj.each_type do |type|
@@ -2499,18 +2534,18 @@ module HDLRuby::Low
             self.value.each_deep(&ruby_block) if self.value
         end
 
-        # Comparison for hash: structural comparison.
-        def eql?(obj)
-            return false unless obj.is_a?(SignalI)
-            return false unless @name.eql?(obj.name)
-            return false unless @type.eql?(obj.type)
-            return true
-        end
+        # # Comparison for hash: structural comparison.
+        # def eql?(obj)
+        #     return false unless obj.is_a?(SignalI)
+        #     return false unless @name.eql?(obj.name)
+        #     return false unless @type.eql?(obj.type)
+        #     return true
+        # end
 
-        # Hash function.
-        def hash
-            return [@name,@type].hash
-        end
+        # # Hash function.
+        # def hash
+        #     return [@name,@type].hash
+        # end
 
         # Gets the bit width.
         def width
@@ -2761,10 +2796,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a code chunk: #{chunk.class}"
             end
-            # if @chunks.has_key?(chunk.name) then
-            if @chunks.include?(chunk) then
-                raise AnyError, "Code chunk #{chunk.name} already present."
-            end
+            # if @chunks.include?(chunk) then
+            #     raise AnyError, "Code chunk #{chunk.name} already present."
+            # end
             # Set its parent.
             chunk.parent = self
             # And add it
@@ -4269,11 +4303,9 @@ module HDLRuby::Low
                 raise AnyError,
                       "Invalid class for a signal instance: #{signal.class}"
             end
-            # if @inners.has_key?(signal.name) then
-            if @inners.include?(signal) then
-                raise AnyError, "SignalI #{signal.name} already present."
-            end
-            # @inners[signal.name] = signal
+            # if @inners.include?(signal) then
+            #     raise AnyError, "SignalI #{signal.name} already present."
+            # end
             # Set its parent.
             signal.parent = self
             # And add it
@@ -4573,7 +4605,8 @@ module HDLRuby::Low
                 # Yes so it is also a left value if it is a sub ref.
                 if parent.respond_to?(:ref) then
                     # It might nor be a sub ref.
-                    return parent.ref == self
+                    # return parent.ref == self
+                    return parent.ref.eql?(self)
                 else
                     # It is necessarily a sub ref (case of RefConcat for now).
                     return true
@@ -4581,7 +4614,8 @@ module HDLRuby::Low
             end
             # No, therefore maybe it is directly a left value.
             return (parent.is_a?(Transmit) || parent.is_a?(Connection)) &&
-                    parent.left == self
+                    # parent.left == self
+                parent.left.eql?(self)
         end
 
         # Tells if the expression is a right value.
@@ -4655,12 +4689,16 @@ module HDLRuby::Low
         # Creates a new value typed +type+ and containing +content+.
         def initialize(type,content)
             super(type)
-            unless content then
+            if content.nil? then
                 # Handle the nil content case.
                 unless type.eql?(Void) then
                     raise AnyError, "A value with nil content must have the Void type."
                 end
                 @content = content
+            elsif content.is_a?(FalseClass) then
+                @content = 0
+            elsif content.is_a?(TrueClass) then
+                @content = 1
             else
                 # Checks and set the content: Ruby Numeric and HDLRuby
                 # BitString are supported. Strings or equivalent are
@@ -4697,8 +4735,8 @@ module HDLRuby::Low
 
         # Comparison for hash: structural comparison.
         def eql?(obj)
-            # General comparison.
-            return false unless super(obj)
+            # # General comparison.
+            # return false unless super(obj)
             # Specific comparison.
             return false unless obj.is_a?(Value)
             return false unless @content.eql?(obj.content)
@@ -5097,7 +5135,7 @@ module HDLRuby::Low
 
 
     ##
-    # Describes a section operation (generalization of the ternary operator).
+    # Describes a selection operation (generalization of the ternary operator).
     #
     # NOTE: choice is using the value of +select+ as an index.
     class Select < Operation
@@ -5263,6 +5301,7 @@ module HDLRuby::Low
         # def initialize(expressions = [])
         def initialize(type,expressions = [])
             super(type)
+            # puts "Building concat=#{self} with direction=#{type.direction}\n"
             # Initialize the array of expressions that are concatenated.
             @expressions = []
             # Check and add the expressions.

data/lib/HDLRuby/hruby_low2c.rb

@@ -709,6 +709,10 @@ module HDLRuby::Low
             # Tells if the behavior is timed or not.
             res << " " * (level+1)*3
             res << "behavior->timed = #{time ? 1 : 0};\n"
+            
+            # Set the active time to 0.
+            res << " " * (level+1)*3
+            res << "behavior->active_time = 0;\n"
 
             # Is it a clocked behavior?
             events = self.each_event.to_a
@@ -858,6 +862,7 @@ module HDLRuby::Low
         #  +level+ is the hierachical level of the object.
         # def to_c(level = 0)
         def to_c(res,level = 0)
+
             # puts "Signal.to_c with name: #{Low2C.obj_name(self)}"
             # Declare the global variable holding the signal.
             res << "SignalI "
@@ -2546,6 +2551,7 @@ module HDLRuby::Low
         # Generates the C text for the equivalent HDLRuby code.
         # +level+ is the hierachical level of the object.
         def to_c(res,level = 0)
+            # puts "to_c fo concat=#{self} with type=#{self.type} and direction=#{self.type.direction}"
             # Save the value pool state.
             res << (" " * (level*3)) << "PV;\n"
             # Gather the content to concat.
@@ -2556,6 +2562,7 @@ module HDLRuby::Low
             end
             # Compute the resulting concatenation.
             res << (" " * ((level+1)*3))
+            # puts "self.type.direction=#{self.type.direction}\n"
             res << "sconcat(#{expressions.size},"
             res << (self.type.direction == :little ? "1" : "0")
             res << ");\n"

data/lib/HDLRuby/hruby_low_mutable.rb

@@ -222,7 +222,7 @@ module HDLRuby::Low
         end
 
         # Deletes all the connections.
-        def delete_all_conncetions!
+        def delete_all_connections!
             @connections.each { |cnx| cnx.parent = nil }
             @connections = []
         end

data/lib/HDLRuby/hruby_low_without_namespace.rb

@@ -147,7 +147,8 @@ module HDLRuby::Low
             cnxs = self.each_connection.to_a
             # Remove them from the scope.
             # cnxs.each { |cnx| self.delete_connection!(cnx) }
-            cnxs.delete_all_connections!
+            # cnxs.delete_all_connections!
+            self.delete_all_connections!
             # Return the connections.
             return cnxs
         end