HDLRuby 2.6.10 → 2.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219077a50d543c3ecdb964a7bd7571f5c0db02ece82a0efb7670e5531acf437d
-  data.tar.gz: 2bbff4911a6c7ff9ec3c33287b61d4a1b7efd5c7dc789975d89e53b3f42638c1
+  metadata.gz: 639411f380dad2eb07b933ae8d23f558dc32e488ceadf1af897026b353a4164b
+  data.tar.gz: 8fb94917c40db1b73a63d323efdc04bbb1e5ebcb65460ebe42c0c468a75ac221
 SHA512:
-  metadata.gz: c95ef3fa229c2e9283cd78f86c9f6fa4ad4f80d0e3f6153ee444e2c75d754dc7098a5547ce623f8aa85b1860e24522f8404a6e654849d0250897acca26134f9a
-  data.tar.gz: '023502192d5189e2a85a4d69d3f63bb81d58d38496812be03b8c7c5c92791309412e21cbb4d68aa79f03372d296635cafe55264e5483d12d8eef56236b188aeb'
+  metadata.gz: 0d00decbd699cc46f450c913b98e5d881fc10e3a9d171126bc3744ad8d05408536b38bc90d1d15227da67302570a425eb2ceccef7d65959e19f591a35aa1f00c
+  data.tar.gz: 9a2f9568732a851786fdfcd794ab146efa4ea36458163a11fe6c992c59bd53f643cd4691804f68e3438f8ce233996af7dd0d8ba205834596bf2b8c7d442ca69d

data/lib/HDLRuby/hdrcc.rb

@@ -491,24 +491,28 @@ end
 
 # Generate the result.
 # Get the top systemT.
+puts Time.now
 $top_system = $top_instance.to_low.systemT
-
-
-# Apply the pre drivers if any.
-Hdecorator.each_with_property(:pre_driver) do |obj, value|
-    unless value.is_a?(Array) && value.size == 2 then
-        raise "pre_driver requires a driver file name command name."
-    end
-    # Load the driver.
-    require_relative(value[0].to_s)
-    # Ensure obj is the low version.
-    if obj.properties.key?(:high2low) then
-        # obj is high, get the corresponding low.
-        obj = obj.properties[:high2low][0]
-    end
-    # Execute it.
-    send(value[1].to_sym,obj,*value[2..-1])
-end
+$top_intance = nil # Free as much memory as possible.
+puts "##### Top system built #####"
+puts Time.now
+
+
+# # Apply the pre drivers if any.
+# Hdecorator.each_with_property(:pre_driver) do |obj, value|
+#     unless value.is_a?(Array) && value.size == 2 then
+#         raise "pre_driver requires a driver file name command name."
+#     end
+#     # Load the driver.
+#     require_relative(value[0].to_s)
+#     # Ensure obj is the low version.
+#     if obj.properties.key?(:high2low) then
+#         # obj is high, get the corresponding low.
+#         obj = obj.properties[:high2low][0]
+#     end
+#     # Execute it.
+#     send(value[1].to_sym,obj,*value[2..-1])
+# end
 
 
 # Gather the non-HDLRuby code.
@@ -558,15 +562,23 @@ elsif $options[:clang] then
     # top_system = $top_system
     # Preprocess the HW description for valid C generation.
     $top_system.each_systemT_deep do |systemT|
+        puts "seq2seq step..."
         # Coverts the par blocks in seq blocks to seq blocks to match
         # the simulation engine.
         systemT.par_in_seq2seq!
+        puts Time.now
+        puts "connections_to_behaviors step..."
         # Converts the connections to behaviors.
         systemT.connections_to_behaviors!
+        puts Time.now
         # Break the RefConcat.
+        puts "concat_assigns step..."
         systemT.break_concat_assigns! 
+        puts Time.now
         # Explicits the types.
+        puts "explicit_types step..."
         systemT.explicit_types!
+        puts Time.now
     end
     # Generate the C.
     if $options[:multiple] then
@@ -691,14 +703,26 @@ elsif $options[:verilog] then
     # top_system = $top_system
     # Make description compatible with verilog generation.
     $top_system.each_systemT_deep do |systemT|
+        puts "casts_without_expression! step..."
         systemT.casts_without_expression!
+        puts Time.now
+        puts "to_upper_space! step..."
         systemT.to_upper_space!
+        puts Time.now
+        puts "to_global_space! step..."
         systemT.to_global_systemTs!
+        puts Time.now
         # systemT.break_types!
         # systemT.expand_types!
+        puts "par_in_seq2seq! step..."
         systemT.par_in_seq2seq!
+        puts Time.now
+        puts "initial_concat_to_timed! step..."
         systemT.initial_concat_to_timed!
+        puts Time.now
+        puts "with_port! step..."
         systemT.with_port!
+        puts Time.now
     end
     # # Verilog generation
     # $output << top_system.to_verilog
@@ -788,13 +812,13 @@ elsif $options[:vhdl] then
     end
 end
 
-# Apply the post drivers if any.
-Hdecorator.each_with_property(:post_driver) do |obj, value|
-    # Load the driver.
-    require_relative(value[0].to_s)
-    # Execute it.
-    send(value[1].to_sym,obj,$output)
-end
+# # Apply the post drivers if any.
+# Hdecorator.each_with_property(:post_driver) do |obj, value|
+#     # Load the driver.
+#     require_relative(value[0].to_s)
+#     # Execute it.
+#     send(value[1].to_sym,obj,$output)
+# end
 
 # Dump the properties
 if $options[:dump] then

data/lib/HDLRuby/hruby_high.rb

@@ -763,9 +763,9 @@ module HDLRuby::High
             systemTL = HDLRuby::Low::SystemT.new(HDLRuby.uniq_name(name),
                                                    self.scope.to_low)
             # puts "New low from system #{self.name}: #{systemTL.name}"
-            # For debugging: set the source high object 
-            systemTL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = systemTL
+            # # For debugging: set the source high object 
+            # systemTL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = systemTL
 
             # Fills the interface of the new system 
             # from the included systems.
@@ -1311,9 +1311,9 @@ module HDLRuby::High
             # Create the resulting low scope.
             # scopeL = HDLRuby::Low::Scope.new()
             scopeL = HDLRuby::Low::Scope.new(self.name)
-            # For debugging: set the source high object 
-            scopeL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = scopeL
+            # # For debugging: set the source high object 
+            # scopeL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = scopeL
 
             # Push the private namespace for the low generation.
             High.space_push(@namespace)
@@ -1545,9 +1545,9 @@ module HDLRuby::High
         def to_low(name = self.name)
             # return HDLRuby::Low::Type.new(name)
             typeL = HDLRuby::Low::Type.new(name)
-            # For debugging: set the source high object 
-            typeL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = typeL
+            # # For debugging: set the source high object 
+            # typeL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = typeL
             return typeL
         end
     end
@@ -1699,9 +1699,9 @@ module HDLRuby::High
         def to_low(name = self.name)
             # return HDLRuby::Low::TypeDef.new(name,self.def.to_low)
             typeDefL = HDLRuby::Low::TypeDef.new(name,self.def.to_low)
-            # For debugging: set the source high object 
-            typeDefL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = typeDefL
+            # # For debugging: set the source high object 
+            # typeDefL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = typeDefL
             return typeDefL
         end
     end
@@ -1752,9 +1752,9 @@ module HDLRuby::High
         def to_low(name = self.name)
             # return HDLRuby::Low::TypeDef.new(name,self.def.to_low)
             typeDefL = HDLRuby::Low::TypeDef.new(name,self.def.to_low)
-            # For debugging: set the source high object 
-            typeDefL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = typeDefL
+            # # For debugging: set the source high object 
+            # typeDefL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = typeDefL
             return typeDefL
         end
     end
@@ -1770,9 +1770,9 @@ module HDLRuby::High
             #                                     self.range.to_low)
             typeVectorL = HDLRuby::Low::TypeVector.new(name,self.base.to_low,
                                                 self.range.to_low)
-            # For debugging: set the source high object 
-            typeVectorL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = typeVectorL
+            # # For debugging: set the source high object 
+            # typeVectorL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = typeVectorL
             return typeVectorL
         end
     end
@@ -1850,9 +1850,9 @@ module HDLRuby::High
             #                    *@types.map { |type| type.to_low } )
             typeTupleL = HDLRuby::Low::TypeTuple.new(name,self.direction,
                                *@types.map { |type| type.to_low } )
-            # For debugging: set the source high object 
-            typeTupleL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = typeTupleL
+            # # For debugging: set the source high object 
+            # typeTupleL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = typeTupleL
             return typeTupleL
         end
     end
@@ -1871,9 +1871,9 @@ module HDLRuby::High
             #                     @types.map { |name,type| [name,type.to_low] } )
             typeStructL = HDLRuby::Low::TypeStruct.new(name,self.direction,
                                 @types.map { |name,type| [name,type.to_low] } )
-            # For debugging: set the source high object 
-            typeStructL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = typeStructL
+            # # For debugging: set the source high object 
+            # typeStructL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = typeStructL
             return typeStructL
         end
     end
@@ -2111,9 +2111,9 @@ module HDLRuby::High
             # Creates the resulting HDLRuby::Low instance
             systemIL = HDLRuby::Low::SystemI.new(High.names_create(name),
                                              systemTL)
-            # For debugging: set the source high object 
-            systemIL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = systemIL
+            # # For debugging: set the source high object 
+            # systemIL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = systemIL
             # Adds the other systemTs.
             self.each_systemT do |systemT|
                 systemIL.add_systemT(systemT.to_low) unless systemT == self.systemT
@@ -2139,9 +2139,9 @@ module HDLRuby::High
                 lump = lump.respond_to?(:to_low) ? lump.to_low : lump.to_s
                 lump
             end)
-            # For debugging: set the source high object 
-            chunkL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = chunkL
+            # # For debugging: set the source high object 
+            # chunkL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = chunkL
             return chunkL
         end
     end
@@ -2153,9 +2153,9 @@ module HDLRuby::High
         def to_low
             # Create the resulting code.
             codeL = HDLRuby::Low::Code.new
-            # For debugging: set the source high object 
-            codeL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = codeL
+            # # For debugging: set the source high object 
+            # codeL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = codeL
             # Add the low-level events.
             self.each_event { |event| codeL.add_event(event.to_low) }
             # Add the low-level code chunks.
@@ -2247,9 +2247,9 @@ module HDLRuby::High
             ifL = HDLRuby::Low::If.new(self.condition.to_low,
                                        self.yes.to_low,noL)
             self.each_noif {|cond,block| ifL.add_noif(cond.to_low,block.to_low)}
-            # For debugging: set the source high object 
-            ifL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = ifL
+            # # For debugging: set the source high object 
+            # ifL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = ifL
             return ifL
         end
     end
@@ -2272,9 +2272,9 @@ module HDLRuby::High
             #                               self.statement.to_low)
             whenL = HDLRuby::Low::When.new(self.match.to_low,
                                           self.statement.to_low)
-            # For debugging: set the source high object 
-            whenL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = whenL
+            # # For debugging: set the source high object 
+            # whenL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = whenL
             return whenL
         end
     end
@@ -2320,9 +2320,9 @@ module HDLRuby::High
         def to_low
             # Create the low level case.
             caseL = HDLRuby::Low::Case.new(@value.to_low)
-            # For debugging: set the source high object 
-            caseL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = caseL
+            # # For debugging: set the source high object 
+            # caseL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = caseL
             # Add each when case.
             self.each_when do |w|
                 caseL.add_when(w.to_low)
@@ -2351,9 +2351,9 @@ module HDLRuby::High
         def to_low
             # return HDLRuby::Low::Delay.new(self.value, self.unit)
             delayL = HDLRuby::Low::Delay.new(self.value, self.unit)
-            # For debugging: set the source high object 
-            delayL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = delayL
+            # # For debugging: set the source high object 
+            # delayL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = delayL
             return delayL
         end
     end
@@ -2367,9 +2367,9 @@ module HDLRuby::High
         def to_low
             # return HDLRuby::Low::TimeWait.new(self.delay.to_low)
             timeWaitL = HDLRuby::Low::TimeWait.new(self.delay.to_low)
-            # For debugging: set the source high object 
-            timeWaitL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = timeWaitL
+            # # For debugging: set the source high object 
+            # timeWaitL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = timeWaitL
             return timeWaitL
         end
     end
@@ -2386,9 +2386,9 @@ module HDLRuby::High
             #                                     self.delay.to_low)
             timeRepeatL = HDLRuby::Low::TimeRepeat.new(self.statement.to_low,
                                                 self.delay.to_low)
-            # For debugging: set the source high object 
-            timeRepeatL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = timeRepeatL
+            # # For debugging: set the source high object 
+            # timeRepeatL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = timeRepeatL
             return timeRepeatL
         end
     end
@@ -2746,9 +2746,9 @@ module HDLRuby::High
         def to_low
             # return HDLRuby::Low::Cast.new(self.type.to_low,self.child.to_low)
             castL =HDLRuby::Low::Cast.new(self.type.to_low,self.child.to_low)
-            # For debugging: set the source high object 
-            castL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = castL
+            # # For debugging: set the source high object 
+            # castL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = castL
             return castL
         end
     end
@@ -2770,9 +2770,9 @@ module HDLRuby::High
             #                                self.child.to_low)
             unaryL = HDLRuby::Low::Unary.new(self.type.to_low, self.operator,
                                            self.child.to_low)
-            # For debugging: set the source high object 
-            unaryL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = unaryL
+            # # For debugging: set the source high object 
+            # unaryL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = unaryL
             return unaryL
         end
     end
@@ -2795,9 +2795,9 @@ module HDLRuby::High
             #                                self.left.to_low, self.right.to_low)
             binaryL = HDLRuby::Low::Binary.new(self.type.to_low, self.operator,
                                            self.left.to_low, self.right.to_low)
-            # For debugging: set the source high object 
-            binaryL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = binaryL
+            # # For debugging: set the source high object 
+            # binaryL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = binaryL
             return binaryL
         end
     end
@@ -2830,9 +2830,9 @@ module HDLRuby::High
             *self.each_choice.map do |choice|
                 choice.to_low
             end)
-            # For debugging: set the source high object 
-            selectL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = selectL
+            # # For debugging: set the source high object 
+            # selectL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = selectL
             return selectL
         end
     end
@@ -2864,9 +2864,9 @@ module HDLRuby::High
                     expr.to_low
                 end
             )
-            # For debugging: set the source high object 
-            concatL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = concatL
+            # # For debugging: set the source high object 
+            # concatL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = concatL
             return concatL
         end
     end
@@ -2908,9 +2908,9 @@ module HDLRuby::High
             # Create and return the resulting low-level value
             # return HDLRuby::Low::Value.new(self.type.to_low,self.content)
             valueL = HDLRuby::Low::Value.new(self.type.to_low,self.content)
-            # For debugging: set the source high object 
-            valueL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = valueL
+            # # For debugging: set the source high object 
+            # valueL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = valueL
             return valueL
         end
 
@@ -3016,9 +3016,9 @@ module HDLRuby::High
             # puts "to_low with base=#{@base} @object=#{@object}"
             refNameL = HDLRuby::Low::RefName.new(self.type.to_low,
                                              @base.to_ref.to_low,@object.name)
-            # For debugging: set the source high object 
-            refNameL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = refNameL
+            # # For debugging: set the source high object 
+            # refNameL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = refNameL
             return refNameL
         end
 
@@ -3056,9 +3056,9 @@ module HDLRuby::High
                     ref.to_low
                 end
             )
-            # For debugging: set the source high object 
-            refConcatL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = refConcatL
+            # # For debugging: set the source high object 
+            # refConcatL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = refConcatL
             return refConcatL
         end
     end
@@ -3080,9 +3080,9 @@ module HDLRuby::High
             #                                 self.ref.to_low,self.index.to_low)
             refIndexL = HDLRuby::Low::RefIndex.new(self.type.to_low,
                                             self.ref.to_low,self.index.to_low)
-            # For debugging: set the source high object 
-            refIndexL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = refIndexL
+            # # For debugging: set the source high object 
+            # refIndexL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = refIndexL
             return refIndexL
         end
     end
@@ -3104,9 +3104,9 @@ module HDLRuby::High
             #     self.ref.to_low,self.range.to_low)
             refRangeL = HDLRuby::Low::RefRange.new(self.type.to_low,
                 self.ref.to_low,self.range.to_low)
-            # For debugging: set the source high object 
-            refRangeL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = refRangeL
+            # # For debugging: set the source high object 
+            # refRangeL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = refRangeL
             return refRangeL
         end
     end
@@ -3127,9 +3127,9 @@ module HDLRuby::High
             #                                  self.ref.to_low,self.name)
             refNameL = HDLRuby::Low::RefName.new(self.type.to_low,
                                              self.ref.to_low,self.name)
-            # For debugging: set the source high object 
-            refNameL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = refNameL
+            # # For debugging: set the source high object 
+            # refNameL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = refNameL
             return refNameL
         end
     end
@@ -3164,9 +3164,9 @@ module HDLRuby::High
         def to_low
             # return HDLRuby::Low::RefThis.new
             refThisL = HDLRuby::Low::RefThis.new
-            # For debugging: set the source high object 
-            refThisL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = refThisL
+            # # For debugging: set the source high object 
+            # refThisL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = refThisL
             return refThisL
         end
     end
@@ -3237,9 +3237,9 @@ module HDLRuby::High
         def to_low
             # return HDLRuby::Low::Event.new(self.type,self.ref.to_low)
             eventL = HDLRuby::Low::Event.new(self.type,self.ref.to_low)
-            # For debugging: set the source high object 
-            eventL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = eventL
+            # # For debugging: set the source high object 
+            # eventL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = eventL
             return eventL
         end
     end
@@ -3280,9 +3280,9 @@ module HDLRuby::High
             #                                   self.right.to_low)
             transmitL = HDLRuby::Low::Transmit.new(self.left.to_low,
                                               self.right.to_low)
-            # For debugging: set the source high object 
-            transmitL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = transmitL
+            # # For debugging: set the source high object 
+            # transmitL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = transmitL
             return transmitL
         end
     end
@@ -3373,9 +3373,9 @@ module HDLRuby::High
             #                                     self.right.to_low)
             connectionL = HDLRuby::Low::Connection.new(self.left.to_low,
                                                 self.right.to_low)
-            # For debugging: set the source high object 
-            connectionL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = connectionL
+            # # For debugging: set the source high object 
+            # connectionL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = connectionL
             return connectionL
         end
     end
@@ -3487,9 +3487,9 @@ module HDLRuby::High
         def to_low(name = self.name)
             # return HDLRuby::Low::SignalI.new(name,self.type.to_low)
             signalIL = HDLRuby::Low::SignalI.new(name,self.type.to_low)
-            # For debugging: set the source high object 
-            signalIL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = signalIL
+            # # For debugging: set the source high object 
+            # signalIL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = signalIL
             return signalIL
         end
     end
@@ -3553,9 +3553,9 @@ module HDLRuby::High
             #                                  self.value.to_low)
             signalCL = HDLRuby::Low::SignalC.new(name,self.type.to_low,
                                              self.value.to_low)
-            # For debugging: set the source high object 
-            signalCL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = signalCL
+            # # For debugging: set the source high object 
+            # signalCL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = signalCL
             return signalCL
         end
     end
@@ -3766,9 +3766,9 @@ module HDLRuby::High
         def to_low
             # Create the resulting block
             blockL = HDLRuby::Low::Block.new(self.mode)
-            # For debugging: set the source high object 
-            blockL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = blockL
+            # # For debugging: set the source high object 
+            # blockL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = blockL
             # Push the namespace for the low generation.
             High.space_push(@namespace)
             # Pushes on the name stack for converting the internals of
@@ -3836,9 +3836,9 @@ module HDLRuby::High
         def to_low
             # Create the resulting block
             blockL = HDLRuby::Low::TimeBlock.new(self.mode)
-            # For debugging: set the source high object 
-            blockL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = blockL
+            # # For debugging: set the source high object 
+            # blockL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = blockL
             # Add the inner signals
             self.each_inner { |inner| blockL.add_inner(inner.to_low) }
             # Add the statements
@@ -3930,9 +3930,9 @@ module HDLRuby::High
             eventLs = self.each_event.map { |event| event.to_low }
             # Create and return the resulting low level behavior.
             behaviorL = HDLRuby::Low::Behavior.new(blockL)
-            # For debugging: set the source high object 
-            behaviorL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = behaviorL
+            # # For debugging: set the source high object 
+            # behaviorL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = behaviorL
             eventLs.each(&behaviorL.method(:add_event))
             return behaviorL
         end
@@ -3960,9 +3960,9 @@ module HDLRuby::High
             eventLs = self.each_event.map { |event| event.to_low }
             # Create and return the resulting low level behavior.
             timeBehaviorL = HDLRuby::Low::TimeBehavior.new(blockL)
-            # For debugging: set the source high object 
-            timeBehaviorL.properties[:low2high] = self.hdr_id
-            self.properties[:high2low] = timeBehaviorL
+            # # For debugging: set the source high object 
+            # timeBehaviorL.properties[:low2high] = self.hdr_id
+            # self.properties[:high2low] = timeBehaviorL
             eventLs.each(&timeBehaviorL.method(:add_event))
             return timeBehaviorL
         end

data/lib/HDLRuby/hruby_low.rb

@@ -1,6 +1,6 @@
 require "HDLRuby/hruby_bstr"
 require "HDLRuby/hruby_error"
-require "HDLRuby/hruby_decorator"
+# require "HDLRuby/hruby_decorator"
 require 'forwardable'
 
 
@@ -36,7 +36,7 @@ module HDLRuby::Low
     end
 
 
-    Hdecorator = HDLRuby::Hdecorator
+    # Hdecorator = HDLRuby::Hdecorator
 
     ##
     # Gives parent definition and access properties to an hardware object.
@@ -118,8 +118,8 @@ module HDLRuby::Low
             end
         end
 
-        # Add decorator capability (modifies intialize to put after).
-        include Hdecorator
+        # # Add decorator capability (modifies intialize to put after).
+        # include Hdecorator
 
         # Comparison for hash: structural comparison.
         def eql?(obj)
@@ -455,8 +455,8 @@ module HDLRuby::Low
             @behaviors = []
         end
 
-        # Add decorator capability (modifies intialize to put after).
-        include Hdecorator
+        # # Add decorator capability (modifies intialize to put after).
+        # include Hdecorator
 
         # Comparison for hash: structural comparison.
         def eql?(obj)
@@ -1221,8 +1221,8 @@ module HDLRuby::Low
             @name = name.to_sym
         end
 
-        # Add decorator capability (modifies intialize to put after).
-        include Hdecorator
+        # # Add decorator capability (modifies intialize to put after).
+        # include Hdecorator
 
         # Comparison for hash: structural comparison.
         def eql?(obj)
@@ -2124,8 +2124,8 @@ module HDLRuby::Low
             # @block = block
         end
 
-        # Add decorator capability (modifies intialize to put after).
-        include Hdecorator
+        # # Add decorator capability (modifies intialize to put after).
+        # include Hdecorator
 
         # Sets the block if not already set.
         def block=(block)
@@ -2348,8 +2348,8 @@ module HDLRuby::Low
             ref.parent = self
         end
 
-        # Add decorator capability (modifies intialize to put after).
-        include Hdecorator
+        # # Add decorator capability (modifies intialize to put after).
+        # include Hdecorator
 
         # Comparison for hash: structural comparison.
         def eql?(obj)
@@ -2432,8 +2432,8 @@ module HDLRuby::Low
             false
         end
 
-        # Add decorator capability (modifies intialize to put after).
-        include Hdecorator
+        # # Add decorator capability (modifies intialize to put after).
+        # include Hdecorator
 
         # Iterates over each object deeply.
         #
@@ -2517,8 +2517,8 @@ module HDLRuby::Low
             @systemTs = [ @systemT ]
         end
 
-        # Add decorator capability (modifies intialize to put after).
-        include Hdecorator
+        # # Add decorator capability (modifies intialize to put after).
+        # include Hdecorator
 
         # Iterates over each object deeply.
         #
@@ -2649,8 +2649,8 @@ module HDLRuby::Low
             lumps.each { |lump| self.add_lump(lump) }
         end
 
-        # Add decorator capability (modifies intialize to put after).
-        include Hdecorator
+        # # Add decorator capability (modifies intialize to put after).
+        # include Hdecorator
 
         # Adds a +lump+ of code, it is ment to become an expression or
         # some text.
@@ -2698,8 +2698,8 @@ module HDLRuby::Low
             @chunks = HashName.new
         end
 
-        # Add decorator capability (modifies intialize to put after).
-        include Hdecorator
+        # # Add decorator capability (modifies intialize to put after).
+        # include Hdecorator
 
         # Adds a +chunk+ to the sensitivity list.
         def add_chunk(chunk)
@@ -2810,7 +2810,7 @@ module HDLRuby::Low
     # NOTE: this is an abstract class which is not to be used directly.
     class Statement
         include Hparent
-        include Hdecorator
+        # include Hdecorator
         
         # Clones (deeply)
         def clone
@@ -3298,8 +3298,8 @@ module HDLRuby::Low
             match.parent = statement.parent = self
         end
 
-        # Add decorator capability (modifies intialize to put after).
-        include Hdecorator
+        # # Add decorator capability (modifies intialize to put after).
+        # include Hdecorator
 
         # Iterates over each object deeply.
         #
@@ -3623,8 +3623,8 @@ module HDLRuby::Low
             @unit = unit.to_sym
         end
 
-        # Add decorator capability (modifies intialize to put after).
-        include Hdecorator
+        # # Add decorator capability (modifies intialize to put after).
+        # include Hdecorator
 
         # Iterates over each object deeply.
         #
@@ -4333,8 +4333,8 @@ module HDLRuby::Low
             end
         end
 
-        # Add decorator capability (modifies intialize to put after).
-        include Hdecorator
+        # # Add decorator capability (modifies intialize to put after).
+        # include Hdecorator
 
         # Comparison for hash: structural comparison.
         def eql?(obj)

data/lib/HDLRuby/hruby_low_resolve.rb

@@ -165,6 +165,30 @@ module HDLRuby::Low
             return false
         end
 
+        ## Gets the systemI the reference comes from if any.
+        def get_systemI
+            # Look for the owner from the name hierarchy.
+            if self.ref.is_a?(RefName) then
+                # Look in the parent hierachy for the sub reference name.
+                parent = self.parent
+                # puts "self.ref.name=#{self.ref.name}"
+                while parent
+                    # puts "parent=#{parent}"
+                    if parent.respond_to?(:get_by_name) then
+                        found = parent.get_by_name(self.ref.name)
+                        # puts "found is a :#{found.class}"
+                        return found if found.is_a?(SystemI)
+                    end
+                    parent = parent.parent
+                end
+                # Not found, look further in the reference hierarchy.
+                return self.ref.get_systemI
+            end
+            # Not from a systemI.
+            # puts "Not from systemI for #{self.name}"
+            return nil
+        end
+
 
         ## Resolves the name of the reference and return the
         #  corresponding object.

data/lib/HDLRuby/hruby_verilog.rb

@@ -134,7 +134,7 @@ module HDLRuby::Low
             if self.name && !self.name.empty? then
                 vname = name_to_verilog(self.name)
                 code << " : #{vname}"
-                self.properties[:verilog_name] = vname
+                # self.properties[:verilog_name] = vname
             end
             code << "\n" if block.each_inner.any?
             # Declaration of "inner" part within "always".
@@ -1371,7 +1371,7 @@ module HDLRuby::Low
         # Converts the system to Verilog code using +renamer+ for producing Verilog-compatible names.
         def to_verilog
             vname = name_to_verilog(self.name)
-            self.properties[:verilog_name] = vname
+            # self.properties[:verilog_name] = vname
             return "#{vname}"
         end
 
@@ -1677,7 +1677,7 @@ module HDLRuby::Low
         def to_verilog
             # Convert unusable characters and return them.
             vname = name_to_verilog(self.name)
-            self.properties[:verilog_name] = vname
+            # self.properties[:verilog_name] = vname
             return "#{vname}"
         end
     end
@@ -1842,7 +1842,7 @@ module HDLRuby::Low
             code = "`timescale 1ps/1ps\n\n"
 
             vname = name_to_verilog(self.name)
-            self.properties[:verilog_name] = vname
+            # self.properties[:verilog_name] = vname
             # Output the module name.
             code << "module #{vname}("
 
@@ -2007,7 +2007,7 @@ module HDLRuby::Low
                 systemT = systemI.systemT
                 code << name_to_verilog(systemT.name) << " "
                 vname = name_to_verilog(systemI.name)
-                systemI.properties[:verilog_name] = vname
+                # systemI.properties[:verilog_name] = vname
                 code << vname << "("
                 # Its ports connections
                 # Inputs

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.6.10"
+  VERSION = "2.6.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.6.10
+  version: 2.6.15
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler