HDLRuby 2.6.16 → 2.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0defaa4d148c2fbdc008f29c75a6ab8a4b48726a932f3222e2dc19c7b229492c
-  data.tar.gz: 9e2d4268200af09e0c078306b5c8a81494b589468b5b8b0084d300d14f922387
+  metadata.gz: 2d49fb40d2d1233c59c0ae1f6d7afea51ab17e70aaac5f605295f4c44e478fa4
+  data.tar.gz: 0b14393197c0af246dae6c221d2beb94580fa9b4c30b234e82efdae4eebf5bca
 SHA512:
-  metadata.gz: ae9f4d696caa0c8f76caa7f0fd05bf1f6554da50c40871c86ad3b44f4c41f3dc184fe58141afd796d3c9448fcdfd04d6869fafc0246fe39236e5f3f48d6bd6a2
-  data.tar.gz: 9cc5165ad15458f4c2f514107f7e15118534c079d061dc2f97aecb0982097fe534b0e26683834b901de34ced55132fc0f3608c19087b87ee5a9137174f49a4d1
+  metadata.gz: e2c55c6966faa1274aee2ae712b376aec22670e9a574b4d5312e73a8a8a1f85713b8312d6b923e4daef030398667c327245ee8aeb813c3d379d137dd63ec9af8
+  data.tar.gz: a28d25d1a5ff5893e64ede5229a4b53c7ad0c4ff6479807e3f76764c9f464fc5d0b6a41f8cce3ea8b49338895a3d95e8582760c64a0d8df21a5683fd0acba4d3

data/lib/HDLRuby/hdrcc.rb

@@ -110,7 +110,7 @@ module HDLRuby
                     else
                         # A standard file is found, skip it since it does not
                         # need to be read.
-                        # puts "Standard files: #{founds}"
+                        # show? "Standard files: #{founds}"
                         return false
                     end
                 end
@@ -134,7 +134,7 @@ module HDLRuby
                     file = @top_file_name
                 end
             end
-            # puts "read_all with file=#{file}"
+            # show? "read_all with file=#{file}"
             # Read the file
             # read(file)
             unless read(file) then
@@ -158,7 +158,7 @@ module HDLRuby
 
         # Displays the syntax tree of all the files.
         def show_all(outfile = $stdout)
-            # puts "@checks.size=#{@checks.size}"
+            # show? "@checks.size=#{@checks.size}"
             @checks.each { |check| check.show(outfile) }
         end
 
@@ -166,7 +166,7 @@ module HDLRuby
         def get_top
             # Get all the systems.
             systems = @checks.reduce([]) {|ar,check| ar + check.get_all_systems}
-            # puts "First systems=#{systems}"
+            # show? "First systems=#{systems}"
             # Remove the systems that are instantiated or included
             # (they cannot be tops)
             @checks.each do |check|
@@ -183,7 +183,7 @@ module HDLRuby
                     systems -= check.get_inherit_systems(inherit)
                 end
             end
-            # puts "Now systems=#{systems}"
+            # show? "Now systems=#{systems}"
             # Return the first top of the list.
             return systems[-1]
         end
@@ -195,7 +195,7 @@ module HDLRuby
             if @top_system == "" then
                 # No, look for it.
                 @top_system = get_top
-                # puts "@top_system=#{@top_system}"
+                # show? "@top_system=#{@top_system}"
                 unless @top_system then
                     # Not found? Error.
                     # Maybe it is a parse error, look for it.
@@ -238,7 +238,7 @@ module HDLRuby
                 # Dump to a file.
                 if chunk.name != :sim then 
                     # The chunk is to be dumbed to a file.
-                    # puts "Outputing chunk:#{HDLRuby::Low::Low2C.obj_name(chunk)}"
+                    # show? "Outputing chunk:#{HDLRuby::Low::Low2C.obj_name(chunk)}"
                     outfile = File.open(path + "/" +
                                        HDLRuby::Low::Low2C.obj_name(chunk) + "." +
                                        chunk.name.to_s,"w")
@@ -351,6 +351,12 @@ $optparse = OptionParser.new do |opts|
     opts.on("-D", "--debug","Set the HDLRuby debug mode") do |d|
         $options[:debug] = d
     end
+    opts.on("--verbose","Set verbose mode.") do |d|
+        HDLRuby.verbosity = 2
+    end
+    opts.on("--volubile","Set extreme verbose mode.") do |d|
+        HDLRuby.verbosity = 3
+    end
     opts.on("-T","--test t0,t1,t2","Compile the unit tests named t0,t1,...") do |t|
         $options[:test] = t
     end
@@ -396,7 +402,7 @@ $optparse = OptionParser.new do |opts|
 end
 $optparse.parse!
 
-# puts "options=#{$options}"
+# show? "options=#{$options}"
 
 # Check the compatibility of the options
 if $options.count {|op| [:yaml,:hdr,:verilog,:vhdl].include?(op) } > 1 then
@@ -436,7 +442,7 @@ if ($options[:test] || $options[:testall]) then
     $test_file.write("require 'std/hruby_unit.rb'\nrequire_relative '#{$input}'\n\n" +
                      "HDLRuby::Unit.test(:\"#{$top}\"#{tests})\n")
     # $test_file.rewind
-    # puts $test_file.read
+    # show? $test_file.read
     # exit
     $test_file.rewind
     # It is the new input file.
@@ -491,11 +497,11 @@ end
 
 # Generate the result.
 # Get the top systemT.
-puts Time.now
+HDLRuby.show Time.now
 $top_system = $top_instance.to_low.systemT
 $top_intance = nil # Free as much memory as possible.
-puts "##### Top system built #####"
-puts Time.now
+HDLRuby.show "##### Top system built #####"
+HDLRuby.show Time.now
 
 
 # # Apply the pre drivers if any.
@@ -562,23 +568,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..."
+        HDLRuby.show "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..."
+        HDLRuby.show Time.now
+        HDLRuby.show "connections_to_behaviors step..."
         # Converts the connections to behaviors.
         systemT.connections_to_behaviors!
-        puts Time.now
+        HDLRuby.show Time.now
         # Break the RefConcat.
-        puts "concat_assigns step..."
+        HDLRuby.show "concat_assigns step..."
         systemT.break_concat_assigns! 
-        puts Time.now
+        HDLRuby.show Time.now
         # Explicits the types.
-        puts "explicit_types step..."
+        HDLRuby.show "explicit_types step..."
         systemT.explicit_types!
-        puts Time.now
+        HDLRuby.show Time.now
     end
     # Generate the C.
     if $options[:multiple] then
@@ -649,7 +655,7 @@ elsif $options[:clang] then
             name = $output + "/" +
                 HDLRuby::Low::Low2C.c_name(systemT.name) +
                 ".c"
-            # puts "for systemT=#{systemT.name} generating: #{name}"
+            # show? "for systemT=#{systemT.name} generating: #{name}"
             # Open the file for current systemT
             outfile = File.open(name,"w")
             # Generate the C code in to.
@@ -703,26 +709,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..."
+        HDLRuby.show "casts_without_expression! step..."
         systemT.casts_without_expression!
-        puts Time.now
-        puts "to_upper_space! step..."
+        HDLRuby.show Time.now
+        HDLRuby.show "to_upper_space! step..."
         systemT.to_upper_space!
-        puts Time.now
-        puts "to_global_space! step..."
+        HDLRuby.show Time.now
+        HDLRuby.show "to_global_space! step..."
         systemT.to_global_systemTs!
-        puts Time.now
+        HDLRuby.show Time.now
         # systemT.break_types!
         # systemT.expand_types!
-        puts "par_in_seq2seq! step..."
+        HDLRuby.show "par_in_seq2seq! step..."
         systemT.par_in_seq2seq!
-        puts Time.now
-        puts "initial_concat_to_timed! step..."
+        HDLRuby.show Time.now
+        HDLRuby.show "initial_concat_to_timed! step..."
         systemT.initial_concat_to_timed!
-        puts Time.now
-        puts "with_port! step..."
+        HDLRuby.show Time.now
+        HDLRuby.show "with_port! step..."
         systemT.with_port!
-        puts Time.now
+        HDLRuby.show Time.now
     end
     # # Verilog generation
     # $output << top_system.to_verilog

data/lib/HDLRuby/hruby_low_without_namespace.rb

@@ -44,8 +44,10 @@ module HDLRuby::Low
         def to_global_systemTs!
             # Force a name if not.
             self.force_name!
+            # puts "to_global_systemTs! for #{self.name}"
             # For each local systemT
             self.scope.each_systemT.to_a.each do |systemT|
+                # puts "Processing system: #{systemT}"
                 # Rename it for globalization.
                 former = systemT.name
                 self.extend_name!(systemT)
@@ -211,6 +213,7 @@ module HDLRuby::Low
         # Replaces recursively +former+ name by +nname+ until it is redeclared
         # in the internals.
         def replace_names_subs!(former,nname)
+            # puts "replace_names_subs! for #{self} with former=#{former} and nname=#{nname}"
             self.each_type do |type|
                 type.replace_names!(former,nname)
             end
@@ -416,8 +419,9 @@ module HDLRuby::Low
             if self.name == former then
                 self.set_name!(nname)
             end
-            # Recurse on the system type.
-            self.systemT.replace_names!(former,nname)
+            # Not needed since treated through scope and systemT.
+            # # Recurse on the system type.
+            # self.systemT.replace_names!(former,nname)
         end
     end
 

data/lib/HDLRuby/hruby_tools.rb

@@ -50,4 +50,28 @@ module HDLRuby
 
     end
 
+
+    # Display some messages depending on the verbosity mode.
+    @@verbosity = 1 # The verbosity level: default 1, only critical messages.
+
+    # Sets the verbosity.
+    def self.verbosity=(val)
+        @@verbosity = val.to_i
+    end
+    
+    # Display a critical message.
+    def self.show!(*args)
+        puts(*args) if @@verbosity > 0
+    end
+
+    # Display a common message.
+    def self.show(*args)
+        puts(*args) if @@verbosity > 1
+    end
+
+    # Display a minor message.
+    def self.show?(*args)
+        puts(*args) if @@verbosity > 2
+    end
+
 end

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.6.16"
+  VERSION = "2.6.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.6.16
+  version: 2.6.18
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler