origen_testers 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ede4a79072352c2cd7d6acaa9fb865179f17316
-  data.tar.gz: 7af62afb233b4363fac108e8ddcbf64f862e33a4
+  metadata.gz: 8c5a15249f0bcd51157464a54eaf398f2fa230a4
+  data.tar.gz: 87645a3a61fa27a203a86a673ef6c4170da201d6
 SHA512:
-  metadata.gz: 65ef5f42b2f18f4d7b6f5218af23f762eb3d3b1687b635e4e39866e2da8e0d03ac99c5e104c71f9a885e92732fa9cf589462eba8fb00eff6d6c1c2d8643d3e98
-  data.tar.gz: a2086e85641e434028486e4313b01ad4efa37959a36cbda1ff4b00c5aea2017e3ef931e4cde098506994471082bb73dd9a875d84f3fa7b37009cff107d9592ab
+  metadata.gz: 89038414f5050a00feee7f45151321a1d9985a65c9abfb42bd630c8de96c51e0a6a40c3c6c43bcf982d3f1f7daa934e0a68674520db5b55def1b54b7c5ebfde1
+  data.tar.gz: d4f87a4092c221d1a912f8e1daeb0588e8aded4d625c1b6c6fc235195d32dd1584c7f7e59afc290959a5017944167195248c24574fe02a81abdcf4d12c29207c

data/config/version.rb

@@ -1,7 +1,7 @@
 module OrigenTesters
   MAJOR = 0
   MINOR = 5
-  BUGFIX = 1
+  BUGFIX = 2
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen_testers/igxl_based_tester/base.rb

@@ -341,6 +341,7 @@ module OrigenTesters
           manual_stop:           false,
           clr_fail_post_match:   false
         }.merge(options)
+        options[:on_block_match_goto] ||= options.delete(:on_pin_match_goto)
 
         match_block(timeout, options) do |match_conditions, fail_conditions|
           # Define match conditions

data/lib/origen_testers/igxl_based_tester/j750.rb

@@ -72,7 +72,8 @@ module OrigenTesters
       # * :check_for_fails (false) - Flushes the pipeline and handshakes with the tester (passing readcode 100) prior to the match (to allow binout of fails encountered before the match)
       # * :force_fail_on_timeout (true) - Force a vector mis-compare if the match loop times out
       # * :on_timeout_goto ("") - Optionally supply a label to branch to on timeout, by default will continue from the end of the match loop
-      # * :on_block_match_goto ("") - Optionally supply a label to branch to when block condition is met, by default will continue from the end of the match loop
+      # * :on_block_match_goto ("") - Optionally supply a label to branch to when block condition is met, by default will continue from the end of the match loop.
+      #   A hash will also be accepted for this argument to supply a specific label (or no label) for each block e.g. {0 => "on_block_0_fail"}
       # * :multiple_entries (false) - Supply an integer to generate multiple entries into the match (each with a unique readcode), this can be useful when debugging patterns with multiple matches
       # * :force_fail_on_timeout (true) - force pattern to fail if timeout occurs
       # * :global_loops (false) - whether match loop loops should use global labels
@@ -200,9 +201,26 @@ module OrigenTesters
           microcode "block_#{i}_matched_#{@unique_counter}:"
           cycle(microcode: 'pop_loop icc')
           cycle(microcode: 'clr_fail')
-        end
-        if options[:on_block_match_goto]
-          cycle(microcode: "jump #{options[:on_block_match_goto]}")
+          if options[:on_block_match_goto]
+            if options[:on_block_match_goto].is_a?(Hash)
+              if options[:on_block_match_goto][i]
+                custom_jump = options[:on_block_match_goto][i]
+              else
+                custom_jump = nil
+              end
+            else
+              custom_jump = options[:on_block_match_goto]
+            end
+          end
+          if custom_jump
+            cycle(microcode: "jump #{custom_jump}")
+          else
+            # Don't do a jump on the last match block as it will naturally fall through
+            # TODO: Update origen core to expose the size
+            unless match_conditions.instance_variable_get(:@block_args).size == i + 1
+              cycle(microcode: "jump match_loop_end_#{@unique_counter} icc")
+            end
+          end
         end
         microcode "match_loop_end_#{@unique_counter}:"
         if options[:clr_fail_post_match]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen