HDLRuby 2.11.12 → 3.1.0

data/lib/HDLRuby/hruby_low_without_select.rb

@@ -52,9 +52,9 @@ module HDLRuby::Low
     end
     
 
-    ## Extends the SystemT class with functionality for converting select
-    #  expressions to case statements.
     class SystemT
+        ## Extends the SystemT class with functionality for converting select
+        #  expressions to case statements.
 
         # Converts the Select expressions to Case statements.
         def select2case!
@@ -63,9 +63,10 @@ module HDLRuby::Low
 
     end
 
+
+    class Scope
     ## Extends the Scope class with functionality for converting select
     #  expressions to case statements.
-    class Scope
 
         # Converts the Select expressions to Case statements.
         def select2case!
@@ -98,9 +99,10 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the TimeWait class with functionality for converting booleans
-    #  in assignments to select operators.
     class TimeWait
+        ## Extends the TimeWait class with functionality for converting booleans
+        #  in assignments to select operators.
+
         # Extract the Select expressions.
         def extract_selects!
             # Nothing to extract.
@@ -109,9 +111,10 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the TimeRepeat class with functionality for converting booleans
-    #  in assignments to select operators.
     class TimeRepeat
+        ## Extends the TimeRepeat class with functionality for converting
+        #  booleans in assignments to select operators.
+
         # Extract the Select expressions.
         def extract_selects!
             # Simply recruse on the statement.
@@ -124,9 +127,9 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Block class with functionality for converting select
-    #  expressions to case statements.
     class Block
+        ## Extends the Block class with functionality for converting select
+        #  expressions to case statements.
 
         # Breaks the assignments to concats.
         #
@@ -151,9 +154,11 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the Transmit class with functionality for converting select
-    #  expressions to case statements.
+
     class Transmit
+        ## Extends the Transmit class with functionality for converting select
+        #  expressions to case statements.
+
         # Extract the Select expressions.
         def extract_selects!
             selects = []
@@ -163,9 +168,11 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the Print class with functionality for converting select
-    #  expressions to case statements.
+
     class Print
+        ## Extends the Print class with functionality for converting select
+        #  expressions to case statements.
+
         # Extract the Select expressions.
         def extract_selects!
             selects = []
@@ -176,19 +183,22 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the TimeTerminate class with functionality for converting select
-    #  expressions to case statements.
+
     class TimeTerminate
+        ## Extends the TimeTerminate class with functionality for converting
+        #  select expressions to case statements.
+
         # Extract the Select expressions.
         def extract_selects!
             # Nothing to extract.
             return []
         end
     end
+
     
-    ## Extends the If class with functionality for converting select
-    #  expressions to case statements.
     class If
+        ## Extends the If class with functionality for converting select
+        #  expressions to case statements.
 
         # Extract the Select expressions.
         #
@@ -200,9 +210,10 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the If class with functionality for converting select
-    #  expressions to case statements.
+
     class When
+        ## Extends the If class with functionality for converting select
+        #  expressions to case statements.
 
         # Extract the Select expressions.
         #
@@ -214,9 +225,10 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the Case class with functionality for converting select
-    #  expressions to case statements.
+
     class Case
+        ## Extends the Case class with functionality for converting select
+        #  expressions to case statements.
 
         # Extract the Select expressions.
         #
@@ -231,9 +243,10 @@ module HDLRuby::Low
         end
     end
 
-    ## Extends the Expression class with functionality for converting select
-    #  expressions to ase statements.
+
     class Expression
+        ## Extends the Expression class with functionality for converting select
+        #  expressions to ase statements.
 
         # Extract the Select expressions and put them into +selects+
         def extract_selects_to!(selects)

data/lib/HDLRuby/hruby_low_without_subsignals.rb

@@ -12,21 +12,36 @@ module HDLRuby::Low
 # Makes handling by some synthesis tools easier.
 #
 ########################################################################
+ 
 
-    ## Extends the SystemT class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class SystemT
+        ## Extends the SystemT class with functionality for decomposing the
+        #  hierachical signals in the statements.
+
+        # # Decompose the hierarchical signals in the statements.
+        # def signal2subs!
+        #     self.scope.signal2subs!
+        # end
 
         # Decompose the hierarchical signals in the statements.
-        def signal2subs!
+        # If +decompose_vec2d+ is true then also decompose 2 dimension vectors
+        # (e.g., for Verilog HDL that does not support handling such signals
+        #  as usual expressions).
+        def signal2subs!(decompose_vec2d = false)
+            @@decompose_vec2d = decompose_vec2d == true
             self.scope.signal2subs!
         end
+
+        ## Tell if 2d vector signals must be decomposed too.
+        def self.decompose_vec2d?
+            @@decompose_vec2d
+        end
     end
 
 
-    ## Extends the Scope class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class Scope
+        ## Extends the Scope class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # Decompose the hierarchical signals in the statements.
         def signal2subs!
@@ -49,9 +64,9 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Behavior class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class Behavior
+        ## Extends the Behavior class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # Decompose the hierarchical signals in the statements.
         def signal2subs!
@@ -74,9 +89,9 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Block class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class Block
+        ## Extends the Block class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # Decompose the hierarchical signals in the statements.
         def signal2subs!
@@ -89,9 +104,9 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the TimeWait class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class TimeWait
+        ## Extends the TimeWait class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # Decompose the hierarchical signals in the statements.
         def signal2subs!
@@ -101,9 +116,9 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the TimeRepeat class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class TimeRepeat
+        ## Extends the TimeRepeat class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # Decompose the hierarchical signals in the statements.
         def signal2subs!
@@ -114,9 +129,9 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Transmit class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class Transmit
+        ## Extends the Transmit class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # Decompose the hierarchical signals in the statements.
         def signal2subs!
@@ -128,9 +143,9 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Print class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class Print
+        ## Extends the Print class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # Decompose the hierarchical signals in the statements.
         def signal2subs!
@@ -141,9 +156,9 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Print class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class TimeTerminate
+        ## Extends the Print class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # Decompose the hierarchical signals in the statements.
         def signal2subs!
@@ -153,9 +168,9 @@ module HDLRuby::Low
     end
     
 
-    ## Extends the If class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class If
+        ## Extends the If class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # Decompose the hierarchical signals in the statements.
         def signal2subs!
@@ -174,9 +189,9 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the When class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class When
+        ## Extends the When class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # Decompose the hierarchical signals in the statements.
         def signal2subs!
@@ -190,9 +205,9 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Case class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class Case
+        ## Extends the Case class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # Decompose the hierarchical signals in the statements.
         def signal2subs!
@@ -207,9 +222,9 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the Expression class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class Expression
+        ## Extends the Expression class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # Decompose the hierarchical signals in the statements.
         def signal2subs!
@@ -221,24 +236,49 @@ module HDLRuby::Low
     end
 
 
-    ## Extends the RefName class with functionality for decomposing the
-    #  hierachical signals in the statements.
     class RefName
+        ## Extends the RefName class with functionality for decomposing the
+        #  hierachical signals in the statements.
 
         # 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
+            # Shall we decompose 2d vectors, and is the current signal
+            # for one of them?
+            if SystemT.decompose_vec2d? and sig.type.is_a?(TypeVector) and
+                    sig.type.base.is_a?(TypeVector) then
+                # Is the reference used other than for a memory access?
+                unless self.parent.is_a?(RefIndex) then
+                    # Yes, do the decomposition.
+                    # Selects the direction.
+                    rng = sig.type.range
+                    if rng.first > rng.last then
+                        itr = (rng.last..rng.first).each
+                    else
+                        itr = rng.reverse_each
+                    end
+                    # Iterate on each element.
+                    itr.each do |i|
+                        # Create a reference fo the sub.
+                        subref = RefIndex.new(sig.type.base,self.clone,
+                                                  Value.new(TypeUnsigned.new(:""),i))
+                        # Add it.
+                        subrefs << subref
+                    end
+                end
+            else
+                # 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)
+                    # Recurse 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
         end