HDLRuby 2.11.10 → 2.11.12

data/lib/HDLRuby/hruby_low_without_concat.rb

@@ -33,6 +33,7 @@ module HDLRuby::Low
 
     end
 
+
     ## Extends the Scope class with functionality for breaking assingments
     #  to concats.
     class Scope
@@ -42,7 +43,8 @@ module HDLRuby::Low
             self.each_scope(&:break_concat_assigns!)
             # Recurse on the statements.
             self.each_behavior do |behavior|
-                behavior.block.each_block_deep(&:break_concat_assigns!)
+                # behavior.block.each_block_deep(&:break_concat_assigns!)
+                behavior.break_concat_assigns!
             end
             # Work on the connections.
             self.each_connection.to_a.each do |connection|
@@ -100,6 +102,18 @@ module HDLRuby::Low
         end
     end
 
+    ## Extends the Behavior class with functionality for breaking assingments
+    #  to concats.
+    class Behavior
+        # Breaks the assignments to concats.
+        def break_concat_assigns!
+            # Recruse on the block.
+            self.block.each_block_deep(&:break_concat_assigns!)
+        end
+    end
+
+
+
     ## Extends the Block class with functionality for breaking assingments
     #  to concats.
     class Block
@@ -107,18 +121,23 @@ module HDLRuby::Low
         #
         # NOTE: work on the direct sub statement only, not deeply.
         def break_concat_assigns!
+            # puts "breack_concat_assigns! with block=#{self} with #{self.each_statement.count} statements"
             # Check each transmit.
-            self.each_statement.each.with_index do |stmnt,i|
+            self.each_statement.to_a.each_with_index do |stmnt|
+                # puts "stmnt=#{stmnt}"
                 if stmnt.is_a?(Transmit) then
                     # Transmit, breaking may be necessary.
                     nstmnt = stmnt.break_concat_assigns
                     if nstmnt.is_a?(Block) then
                         # The transmit has been broken, remove the former
                         # version and add the generated block as a behavior.
-                        self.set_statement!(i,nstmnt)
+                        # self.set_statement!(i,nstmnt)
+                        self.replace_statement!(stmnt,nstmnt)
+                        # puts "nstmnt.parent=#{nstmnt.parent}"
                     end
                 end
             end
+            return self
         end
     end
 
@@ -144,11 +163,12 @@ module HDLRuby::Low
                     top_scope = top_block.top_scope
                     aux = top_scope.add_inner(
                         SignalI.new(HDLRuby.uniq_name,self.right.type) )
-                    # puts "new signal: #{aux.name}"
                     aux = RefName.new(aux.type,RefThis.new,aux.name)
                     # Is a default value required to avoid latch generation?
-                    unless top_block.parent.each_event.
-                            find {|ev| ev.type!=:change} then
+                    unless top_block.is_a?(TimeBlock) ||
+                           top_block.parent.each_event.
+                            # find {|ev| ev.type!=:change} then
+                            find {|ev| ev.type!=:anyedge} then
                         # Yes, generate it.
                         top_block.insert_statement!(0,
                             Transmit.new(aux.clone,Value.new(aux.type,0)))
@@ -204,8 +224,8 @@ module HDLRuby::Low
                         end
                         pos += ref.type.width
                     end
-                    # puts "Resulting block=#{block.to_vhdl}"
                     # Return the resulting block
+                    # puts "new block=#{block}"
                     return block
                 end
             end
@@ -229,7 +249,7 @@ module HDLRuby::Low
                 if node.is_a?(RefConcat) then
                     # Yes, must break. Create the resulting sequential
                     # block that will contain the new assignements.
-                    block = Block.new(:seq)
+                    block = Block.new(:par)
                     # Create an intermediate signal for storing the
                     # right value. Put it in the top scope.
                     top_scope = self.top_scope

data/lib/HDLRuby/hruby_low_without_parinseq.rb

@@ -122,6 +122,9 @@ module HDLRuby::Low
         def to_seq!
             if self.mode == :par then
                 # Need to convert.
+                # Get which module is it.
+                modul = self.is_a?(HDLRuby::High::Block) ? HDLRuby::High :
+                    HDLRuby::Low
                 # First recurse on the sub blocks.
                 self.each_statement(&:to_seq!)
                 # Now replace each left value by a new signal for
@@ -130,16 +133,23 @@ module HDLRuby::Low
                 self.each_statement do |statement|
                     left = statement.left
                     if statement.is_a?(Transmit) then
-                        sig = SignalI.new(HDLRuby.uniq_name,left.type)
-                        self.add_inner(sig)
-                        diff = RefName.new(left.type,RefThis.new,sig.name)
+                        if modul == HDLRuby::High then
+                            sig = modul::SignalI.new(HDLRuby.uniq_name,left.type,:inner)
+                            self.add_inner(sig)
+                            puts "sig.parent=#{sig.parent}"
+                            diff = modul::RefObject.new(modul::RefThis.new,sig)
+                        else
+                            sig = modul::SignalI.new(HDLRuby.uniq_name,left.type)
+                            self.add_inner(sig)
+                            diff = modul::RefName.new(left.type,modul::RefThis.new,sig.name)
+                        end
                         differeds << [left,diff]
                         statement.set_left!(diff)
                     end
                 end
                 # Adds the differed assignments.
                 differeds.each do |left,diff|
-                    self.add_statement(Transmit.new(left.clone,diff.clone))
+                    self.add_statement(modul::Transmit.new(left.clone,diff.clone))
                 end
                 # Change the mode.
                 self.set_mode!(:seq)

data/lib/HDLRuby/hruby_low_without_select.rb

@@ -82,7 +82,7 @@ module HDLRuby::Low
                 selects = connection.extract_selects!
                 if selects.any? then
                     # Selects have been extract, replace the connection
-                    # be y behavior.
+                    # by a behavior.
                     # Generate the block with cases.
                     blk = LowWithoutSelect.selects2block(selects)
                     # Add a transmit replacing the connection.
@@ -214,7 +214,7 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the If class with functionality for converting select
+    ## Extends the Case class with functionality for converting select
     #  expressions to case statements.
     class Case
 

data/lib/HDLRuby/hruby_low_without_subsignals.rb

@@ -0,0 +1,279 @@
+require 'HDLRuby'
+require 'HDLRuby/hruby_tools'
+require 'HDLRuby/hruby_low_mutable'
+require 'HDLRuby/hruby_low_resolve'
+
+
+module HDLRuby::Low
+
+
+##
+# Replace hierachical signals by the list of their sub signals.
+# Makes handling by some synthesis tools easier.
+#
+########################################################################
+
+    ## Extends the SystemT class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class SystemT
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            self.scope.signal2subs!
+        end
+    end
+
+
+    ## Extends the Scope class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class Scope
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # Recruse on the sub scopes.
+            self.each_scope(&:signal2subs!)
+
+            # Recurse on the blocks.
+            self.each_behavior do |behavior|
+                # behavior.block.each_block_deep(&:signal2subs!)
+                behavior.signal2subs!
+            end
+
+            # Work on the connections.
+            self.each_connection.to_a.each do |connection|
+                # Recurse on the left and right.
+                connection.set_left!(connection.left.signal2subs!)
+                connection.set_right!(connection.right.signal2subs!)
+            end
+        end
+    end
+
+
+    ## Extends the Behavior class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class Behavior
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # Process the events.
+            self.each_event.to_a.each do |ev|
+                subrefs = ev.ref.flatten
+                if subrefs.any? then
+                    # The refence have been flattend, remove the event.
+                    self.delete_event!(ev)
+                    # And add instead new events for the sub references.
+                    subrefs.each do |subref|
+                        nev = Event.new(ev.type,subref)
+                        self.add_event(nev)
+                    end
+                end
+            end
+            # Recurse on the blocks.
+            self.block.each_block_deep(&:signal2subs!)
+        end
+    end
+
+
+    ## Extends the Block class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class Block
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # Recurse on the statments.
+            self.map_statements! do |stmnt|
+                stmnt.signal2subs!
+            end
+            return self
+        end
+    end
+
+
+    ## Extends the TimeWait class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class TimeWait
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # Nothing to do.
+            return self
+        end
+    end
+
+
+    ## Extends the TimeRepeat class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class TimeRepeat
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # Recurse on the statement.
+            self.set_statement!(self.statement.signal2subs!)
+            return self
+        end
+    end
+
+
+    ## Extends the Transmit class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class Transmit
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # Recurse on the left and right.
+            self.set_left!(self.left.signal2subs!)
+            self.set_right!(self.right.signal2subs!)
+            return self
+        end
+    end
+
+
+    ## Extends the Print class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class Print
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # Recurse on the arguments.
+            self.map_args! { |arg| arg.signal2subs! }
+            return self
+        end
+    end
+
+
+    ## Extends the Print class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class TimeTerminate
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # Nothing to do.
+            return self
+        end
+    end
+    
+
+    ## Extends the If class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class If
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # Recurse on the condition.
+            self.set_condition!(self.condition.signal2subs!)
+            # Recurse on the yes block.
+            self.yes.signal2subs!
+            # Recurse on the no block if any.
+            self.no.signal2subs! if self.no
+            # Recurse on the alternate ifs.
+            self.map_noifs! do |cond,stmnt|
+                [cond.signal2subs!,stmnt.signal2subs!]
+            end
+            return self
+        end
+    end
+
+
+    ## Extends the When class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class When
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # Recurse on the match.
+            self.set_match!(self.match.signal2subs!)
+            # Recurse on the statement.
+            self.set_statement!(self.statement.signal2subs!)
+            return self
+        end
+
+    end
+
+
+    ## Extends the Case class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class Case
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # Recurse on the case value.
+            self.set_value!(self.value.signal2subs!)
+            # Recurse on the whens.
+            self.each_when(&:signal2subs!)
+            # Recurse on the default.
+            self.set_default!(self.default.signal2subs!) if self.default
+            return self
+        end
+    end
+
+
+    ## Extends the Expression class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class Expression
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # puts "signal2subs! for expr=#{self}"
+            # Recurse on the subexpressions.
+            self.map_expressions!(&:signal2subs!)
+            return self
+        end
+    end
+
+
+    ## Extends the RefName class with functionality for decomposing the
+    #  hierachical signals in the statements.
+    class RefName
+
+        # Flatten a reference to a list of reference to leaf signals
+        # from signal +sig+ and add to result to +subrefs+
+        def flatten_to(sig,subrefs)
+            # puts "flatten_to with sig name=#{sig.name}"
+            # Work on the sub signals if any.
+            sig.each_signal do |sub|
+                # Create a reference for the sub.
+                subref = RefName.new(sub.type,self.clone,sub.name)
+                # Recruse on it.
+                subref.flatten_to(sub,subrefs)
+                # Was it a leaf?
+                unless sub.each_signal.any? then
+                    # Yes, add its new ref to the list of subs.
+                    subrefs << subref
+                end
+            end
+        end
+
+        # Flatten the current ref to a list of references.
+        # If the reference is not heirachical, returns an empty list.
+        def flatten
+            subrefs = []
+            self.flatten_to(self.resolve,subrefs)
+            return subrefs
+        end
+
+        # Decompose the hierarchical signals in the statements.
+        def signal2subs!
+            # puts "signal2subs! for RefName: #{self.name}"
+            # Decompose it to a list of reference to each leaf sub signal.
+            subrefs = []
+            self.flatten_to(self.resolve,subrefs)
+            # puts "subrefs=#{subrefs.map{|subref| subref.name}}"
+            # Has it sub signals?
+            if (subrefs.any?) then
+                # Yes, convert it to a Concat.
+                if self.leftvalue? then
+                    return RefConcat.new(self.type,subrefs)
+                else
+                    return Concat.new(self.type,subrefs)
+                end
+            else
+                # Nothing to do.
+                return self
+            end
+        end
+    end
+
+
+
+
+end