origen_testers 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de1979a623e59045505464aadab0a98eb13d246c
-  data.tar.gz: dd26351c8f5c86c96b54d02f8188adb65ed3b449
+  metadata.gz: b0f226f6dedd573e39ddba26d36a52588d89cfaf
+  data.tar.gz: edf5678acb10070388405fba3b820c4fd96172a7
 SHA512:
-  metadata.gz: 9d025b93e979a036865b3156b5803ad17835369abd4e7f4567ec073590d09b44de39333b968503a805d6e1a3c7858fbafba8d8ae5b82fa8a3829f54dd3819b06
-  data.tar.gz: 279a25ecdd7ec2f88f8964ba312ead4f4beb25308f9c5b2e8afe28c3a903b4ac3e1efc3127dfec8b0d762a60e0518fb9d4b91e483f2142d33c03ae178b11912a
+  metadata.gz: b15f679c0ccb26a23fbb09523d245b3761e2d081ce18bdccac93dc2945df51baf8346f6bfdc21f378ae28ee62d76d8aeb0ad3dfac9ac46f3bb5f8ae286092240
+  data.tar.gz: 758b94cc1811e3e750991031e13f5070c53b274a59e99dec84948496ddb1e29da55e5537ba0d0a9beb0a62f7b8f04787e65cf5b7d1b03fd9d5e3648455ff5f20

data/config/version.rb

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

data/lib/origen_testers/callback_handlers.rb

@@ -29,9 +29,6 @@ module OrigenTesters
       end
       true
     end
-    # Instantiate an instance of this class immediately when this file is required, this object will
-    # then listen for the remainder of the Origen thread
-    CallbackHandlers.new
 
     private
 
@@ -55,4 +52,8 @@ module OrigenTesters
       end
     end
   end
+
+  # Instantiate an instance of this class immediately when this file is required, this object will
+  # then listen for the remainder of the Origen thread
+  CallbackHandlers.new
 end

data/lib/origen_testers/smartest_based_tester/base.rb

@@ -3,6 +3,9 @@ module OrigenTesters
     class Base
       include VectorBasedTester
 
+      # Disable inline (end of vector) comments, enabled by default
+      attr_accessor :inline_comments
+
       # Returns a new J750 instance, normally there would only ever be one of these
       # assigned to the global variable such as $tester by your target:
       #   $tester = J750.new
@@ -16,6 +19,7 @@ module OrigenTesters
         @name = 'v93k'
         @comment_char = '#'
         @level_period = true
+        @inline_comments = true
       end
 
       # Capture the pin data from a vector to the tester.
@@ -385,27 +389,48 @@ module OrigenTesters
         else
           microcode = vec.microcode ? vec.microcode : ''
         end
-        header_comments = ''
-        vec.comments.each do |comment|
-          if comment.include? '#'
-            comment = comment.gsub(/# /, '')
-            comment = comment.gsub(/#/, '')
-            if comment != ''
-              header_comments << comment + "\cm"
+
+        if Origen.mode.simulation? || !inline_comments || $_testers_no_inline_comments
+          comment = ''
+        else
+
+          header_comments = []
+          repeat_comment = ''
+          vec.comments.each_with_index do |comment, i|
+            if comment =~ /^#/
+              if comment =~ /^#(R\d+)$/
+                repeat_comment = Regexp.last_match(1) + ' '
+              # Throw away the ############# headers and footers
+              elsif comment !~ /^# ####################/
+                comment = comment.strip.sub(/^# (## )?/, '')
+                if comment == ''
+                  # Throw away empty lines at the start/end, but preserve them in the middle
+                  unless header_comments.empty? || i == vec.comments.size - 1
+                    header_comments << comment
+                  end
+                else
+                  header_comments << comment
+                end
+              end
             end
           end
+
+          if vec.pin_vals && ($_testers_enable_vector_comments || vector_comments)
+            comment = "#{vec.number}:#{vec.cycle}"
+            comment += ': ' if !header_comments.empty? || !vec.inline_comment.empty?
+          else
+            comment = ''
+          end
+          comment += header_comments.join("\cm") unless header_comments.empty?
+          unless vec.inline_comment.empty?
+            comment += "\cm" unless header_comments.empty?
+            comment += "(#{vec.inline_comment})"
+          end
+          comment = "#{repeat_comment}#{comment}"
         end
-        if vec.pin_vals && ($_testers_enable_vector_comments || vector_comments)
-          comment = "#{header_comments}#{vec.number}:#{vec.cycle} #{vec.inline_comment}"
-        else
-          inline = vec.inline_comment.empty? ? '' : " # #{vec.inline_comment}"
-          comment = " #{header_comments}#{inline}"
-        end
-        if Origen.mode.simulation? || $_testers_no_inline_comments
-          comment = ''
-        end
-        comment.slice! 250..-1 # Max comment length 250
-        "#{microcode.ljust(25)}#{timeset.ljust(27)}#{pin_vals}#{comment};"
+
+        # Max comment length 250 at the end
+        "#{microcode.ljust(25)}#{timeset.ljust(27)}#{pin_vals}# #{comment[0, 247]};"
       end
 
       # All vectors generated with the supplied block will have all pins set

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_testers
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.31
+        version: 0.7.40
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.31
+        version: 0.7.40
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement