HDLRuby 2.4.29 → 2.5.0

data/lib/HDLRuby/hruby_verilog.rb

@@ -126,7 +126,12 @@ class Block
     # of each line.
     def to_verilog(spc = 3)
             code = "begin"
-            code << " : #{name_to_verilog(self.name)}" if self.name && !self.name.empty?
+            # code << " : #{name_to_verilog(self.name)}" if self.name && !self.name.empty?
+            if self.name && !self.name.empty? then
+                vname = name_to_verilog(self.name)
+                code << " : #{vname}"
+                self.properties[:verilog_name] = vname
+            end
             code << "\n" if block.each_inner.any?
             # Declaration of "inner" part within "always".
             block.each_inner do |inner|
@@ -1384,8 +1389,10 @@ end
 class RefName
     # Converts the system to Verilog code using +renamer+ for producing Verilog-compatible names.
     def to_verilog
-        # return "#{self.name.to_s}"
-        return "#{name_to_verilog(self.name)}"
+        # return "#{name_to_verilog(self.name)}"
+        vname = name_to_verilog(self.name)
+        self.properties[:verilog_name] = vname
+        return "#{vname}"
     end
 
     # Used for instantiation (emergency procedure).
@@ -1750,7 +1757,10 @@ class SignalI
     # Converts the system to Verilog code.
     def to_verilog
         # Convert unusable characters and return them.
-        return "#{name_to_verilog(self.name)}"
+        # return "#{name_to_verilog(self.name)}"
+        vname = name_to_verilog(self.name)
+        self.properties[:verilog_name] = vname
+        return "#{vname}"
     end
 end
 
@@ -1932,8 +1942,14 @@ class SystemT
 
         # Spelling necessary for simulation.
         code = "`timescale 1ps/1ps\n\n"
+
+        # # Output the module name.
+        # code << "module #{name_to_verilog(self.name)}("
+
+        vname = name_to_verilog(self.name)
+        self.properties[:verilog_name] = vname
         # Output the module name.
-        code << "module #{name_to_verilog(self.name)}("
+        code << "module #{vname}("
 
         # Output the last two to the input. 
         inputs[0..-2].each do |input|
@@ -2110,7 +2126,10 @@ class SystemT
             code << " " * 3
             systemT = systemI.systemT
             code << name_to_verilog(systemT.name) << " "
-            code << name_to_verilog(systemI.name) << "("
+            # code << name_to_verilog(systemI.name) << "("
+            vname = name_to_verilog(systemI.name)
+            systemI.properties[:verilog_name] = vname
+            code << vname << "("
             # Its ports connections
             # Inputs
             systemT.each_input do |input|

data/lib/HDLRuby/template_expander.rb

@@ -0,0 +1,61 @@
+require 'strscan'
+
+##
+# Tool for expanding template files.
+#
+# Used for generating files like confugaration file for given HW target
+#
+########################################################################
+
+
+class TemplateExpander
+
+    ## Describes an expansion rule.
+    Rule = Struct.new(:match,:action)
+
+    # Creates a new template expander with potential list of +rules+.
+    def initialize(rules= [])
+        # Setup the rules.
+        @rules = rules.map do |match,action|
+            # Ensures action is a proc.
+            action = proc { |str| action.to_s } unless action.is_a?(Proc)
+            # Create the rule.
+            Rule.new(Regexp.new(match), action)
+        end
+        # The skip regexp is empty, it has to be built with finalize.
+        @skip = nil
+    end
+
+    # Adds a +rule+.
+    def add_rule(*rule)
+        @rules << Rule.new(Regexp.new(rule[0]), rule[1])
+    end
+
+    # Finalize the expander by building the default rule.
+    def finalize
+        # @skip = Regexp.union(*@rules.map { |rule| rule.match })
+        @skip = /(?=#{Regexp.union(*@rules.map { |rule| rule.match }).source})|\z/
+    end
+
+    # Apply the expander to +str+ and put the result in +res+.
+    def expand(str,res = "")
+        # Ensure the default rule is properly set up.
+        self.finalize
+        # Scan the string with each rule.
+        scanner = StringScanner.new(str)
+        until scanner.eos? do
+            @rules.find do |rule|
+                scanned = scanner.scan(rule.match)
+                if scanned then
+                    res << rule.action.call(scanned)
+                else
+                    false
+                end
+            end
+            res << scanner.scan_until(@skip)
+        end
+        return res
+    end
+    
+
+end

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.4.29"
+  VERSION = "2.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.4.29
+  version: 2.5.0
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,8 @@ files:
 - lib/HDLRuby/alcc.rb
 - lib/HDLRuby/backend/hruby_allocator.rb
 - lib/HDLRuby/backend/hruby_c_allocator.rb
+- lib/HDLRuby/drivers/xcd.rb
+- lib/HDLRuby/drivers/xcd/dummy.xcd
 - lib/HDLRuby/hdr_samples/WithMultiChannelExpVerilog/with_multi_channels_hs_32.v
 - lib/HDLRuby/hdr_samples/WithMultiChannelExpVerilog/with_multi_channels_qu_213.v
 - lib/HDLRuby/hdr_samples/WithMultiChannelExpVerilog/with_multi_channels_qu_222.v
@@ -85,6 +87,7 @@ files:
 - lib/HDLRuby/hdr_samples/dff.rb
 - lib/HDLRuby/hdr_samples/dff_bench.rb
 - lib/HDLRuby/hdr_samples/dff_counter.rb
+- lib/HDLRuby/hdr_samples/dff_properties.rb
 - lib/HDLRuby/hdr_samples/include.rb
 - lib/HDLRuby/hdr_samples/instance_open.rb
 - lib/HDLRuby/hdr_samples/linear_test.rb
@@ -199,6 +202,7 @@ files:
 - lib/HDLRuby/hruby_bstr.rb
 - lib/HDLRuby/hruby_check.rb
 - lib/HDLRuby/hruby_db.rb
+- lib/HDLRuby/hruby_decorator.rb
 - lib/HDLRuby/hruby_error.rb
 - lib/HDLRuby/hruby_high.rb
 - lib/HDLRuby/hruby_low.rb
@@ -293,6 +297,7 @@ files:
 - lib/HDLRuby/std/pipeline.rb
 - lib/HDLRuby/std/reconf.rb
 - lib/HDLRuby/std/task.rb
+- lib/HDLRuby/template_expander.rb
 - lib/HDLRuby/test_hruby_bstr.rb
 - lib/HDLRuby/test_hruby_high.rb
 - lib/HDLRuby/test_hruby_high_low.rb