HDLRuby 2.4.26 → 2.5.1

data/lib/HDLRuby/std/linear.rb

@@ -229,20 +229,14 @@ module HDLRuby::High::Std
                 hif(~rvok) { right.read(rv) { rvok <= 1 } }
                 lefts.each_with_index do |left,i|
                     hif(~lvoks[i]) { left.read(lvs[i])  { lvoks[i] <= 1 } }
-                    # accs[i].read(avs[i])
                     hif(lvoks[i] & rvok & ~woks[i]) do
                         ack <= 1
                         run <= 0
-                        # seq do
-                        #     avs[i] <= add.(avs[i],mul.(lvs[i],rv))
-                        #     accs[i].write(avs[i]) do
-                        #         woks[i] <= 1
-                        #     end
-                        # end
-                        # Seems that can do without seq.
-                        avs[i] <= add.(avs[i],mul.(lvs[i],rv))
-                        accs[i].write(avs[i]) do
-                            woks[i] <= 1
+                        seq do
+                            avs[i] <= add.(avs[i],mul.(lvs[i],rv))
+                            accs[i].write(avs[i]) do
+                                woks[i] <= 1
+                            end
                         end
                     end
                     hif (woks.reduce(:&)) do

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.26"
+  VERSION = "2.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.4.26
+  version: 2.5.1
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-03-16 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,8 @@ 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/dff_unit.rb
 - lib/HDLRuby/hdr_samples/include.rb
 - lib/HDLRuby/hdr_samples/instance_open.rb
 - lib/HDLRuby/hdr_samples/linear_test.rb
@@ -116,6 +120,7 @@ files:
 - lib/HDLRuby/hdr_samples/register_with_code_bench.rb
 - lib/HDLRuby/hdr_samples/rom.rb
 - lib/HDLRuby/hdr_samples/ruby_fir_hw.rb
+- lib/HDLRuby/hdr_samples/seqpar_bench.rb
 - lib/HDLRuby/hdr_samples/struct.rb
 - lib/HDLRuby/hdr_samples/sumprod.rb
 - lib/HDLRuby/hdr_samples/sw_encrypt_bench.rb
@@ -198,6 +203,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
@@ -221,10 +227,12 @@ files:
 - lib/HDLRuby/hruby_low_without_connection.rb
 - lib/HDLRuby/hruby_low_without_namespace.rb
 - lib/HDLRuby/hruby_low_without_outread.rb
+- lib/HDLRuby/hruby_low_without_parinseq.rb
 - lib/HDLRuby/hruby_low_without_select.rb
 - lib/HDLRuby/hruby_serializer.rb
 - lib/HDLRuby/hruby_tools.rb
 - lib/HDLRuby/hruby_types.rb
+- lib/HDLRuby/hruby_unit.rb
 - lib/HDLRuby/hruby_values.rb
 - lib/HDLRuby/hruby_verilog.rb
 - lib/HDLRuby/hruby_verilog_name.rb
@@ -291,6 +299,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