origen 0.7.21 → 0.7.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f76d497c905280cf72bbd0cb557394efb9de93ec
-  data.tar.gz: ed16dfa8b87b2332343c60726cebe88a7823887b
+  metadata.gz: ac431b3c69fa97233c3cf47c28ba88f5acff4d63
+  data.tar.gz: 1a0f88d62a1cfbfb7305106d2ca77b76d116590c
 SHA512:
-  metadata.gz: f4f7a3211f862fbb198e17ae087244d6c350f19fd1b088f7f3e42ca133e183eb027edc57b326cdf0f14405a81a58d8fc41d01ff61c6962ba3f4b13626d4f3dff
-  data.tar.gz: 17d8ac1c25a3838b0421429286855bfdc9d937284581f51599a440fac938d05d3793f5206294889919cb4c41f8c94a47740cddea2f1abf2b2f39574bcd612942
+  metadata.gz: d6c5f3f359a15736467ffa20a9c8369613f90ef0bae436ca9bbb9f193ed4701c61a9e18ee221561cca9727b0d88655df579ff51c99e6a91dcd9ee9e88d929d9a
+  data.tar.gz: 960961ec6d3a0e3e2c236ccc81f5c6417ba235e1c5d7c89b2b47038dd41251ddf9dd83796389d70965aa69ff5eeaa1d4af2341080e730955eb76825ef4c28763

data/config/boot.rb

@@ -1,6 +1,5 @@
 # Interfaces must be required, can't autoload
 require "c99/ate_interface"
-require "c99/doc_interface"
 # The majority of this class is defined in the support application,
 # this is to test that the importing application can override and
 # extend imported classes.

data/config/version.rb

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

data/lib/origen/application.rb

@@ -595,7 +595,7 @@ module Origen
       dynamic_resource(:toplevel_listeners, [], adding: true) << obj
     end
 
-    # Any attempts to instantiate a test within the give block will be forced to instantiate
+    # Any attempts to instantiate a tester within the give block will be forced to instantiate
     # an Origen::Tester::Doc instance
     def with_doc_tester(options = {})
       @with_doc_tester = true

data/lib/origen/generator/pattern.rb

@@ -332,6 +332,7 @@ module Origen
               listener.shutdown(options)
             end
           end
+          ss 'Pattern complete'
 
           # Now the pattern has run call the render method if the tester uses a template
           Origen.tester.render_template

data/lib/origen/registers/bit_collection.rb

@@ -279,6 +279,17 @@ module Origen
         ~data & ((1 << size) - 1)
       end
 
+      # Returns the reverse of the data value held by the collection
+      def data_reverse
+        data = 0
+        reverse.each_with_index do |bit, i|
+          return undefined if bit.is_a?(Origen::UndefinedClass)
+          data |= bit.data << i
+        end
+        data
+      end
+      alias_method :reverse_data, :data_reverse
+
       # Supports reg.bit[0] and bitcollection.bit[0]
       def bit
         self

data/lib/origen/registers/reg.rb

@@ -151,9 +151,10 @@ module Origen
 
           # BIT NAME ROW
           line = '  '
+          first_done = false
           named_bits include_spacers: true do |name, bit, bitcounter|
             if _bit_in_range?(bit, max_bit, min_bit)
-              if max_bit > (size - 1)
+              if max_bit > (size - 1) && !first_done
                 (max_bit - (size - 1)).times do
                   line << ' ' * (bit_width + 1)
                 end
@@ -172,8 +173,12 @@ module Origen
                     bit_name = "#{name}[#{upper}:#{lower}]"
                     bit_span = upper - lower + 1
                   end
-                  width = bit_width * bit_span
-                  line << '|' + "#{bit_name[0..width - 2]}".center(width + bit_span - 1)
+                  width = (bit_width * bit_span) + bit_span - 1
+                  if bit_name.length > width
+                    line << '|' + "#{bit_name[0..width - 2]}*"
+                  else
+                    line << '|' + bit_name.center(width)
+                  end
 
                 else
                   bit.shift_out_left do |bit|
@@ -186,22 +191,28 @@ module Origen
               else
                 if name
                   bit_name = "#{name}"
-                  txt = "#{bit_name[0..bit_width - 2]}"
+                  if bit_name.length > bit_width
+                    txt = "#{bit_name[0..bit_width - 2]}*"
+                  else
+                    txt = bit_name
+                  end
                 else
                   txt = ''
                 end
                 line << '|' + txt.center(bit_width)
               end
             end
+            first_done = true
           end
           line += '|'
           desc << line
 
           # BIT STATE ROW
           line = '  '
+          first_done = false
           named_bits include_spacers: true do |name, bit, _bitcounter|
             if _bit_in_range?(bit, max_bit, min_bit)
-              if max_bit > (size - 1)
+              if max_bit > (size - 1) && !first_done
                 (max_bit - (size - 1)).times do
                   line << ' ' * (bit_width + 1)
                 end
@@ -247,6 +258,7 @@ module Origen
                 end
               end
             end
+            first_done = true
           end
           line += '|'
           desc << line

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.21
+  version: 0.7.22
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -346,7 +346,6 @@ files:
 - helpers/guides.rb
 - helpers/url.rb
 - lib/c99/ate_interface.rb
-- lib/c99/doc_interface.rb
 - lib/c99/nvm.rb
 - lib/c99/target/mock2.rb
 - lib/c99/target/subdir/mock3.rb
@@ -573,4 +572,3 @@ signing_key:
 specification_version: 4
 summary: The Semiconductor Developer's Kit
 test_files: []
-has_rdoc: 

data/lib/c99/doc_interface.rb

@@ -1,56 +0,0 @@
-module C99
-  class DocInterface
-    include OrigenTesters::Doc::Generator
-
-    # Options passed to Flow.create and Library.create will be passed in here, use as
-    # desired to configure your interface
-    def initialize(_options = {})
-    end
-
-    def resources_filename=(*_args)
-    end
-
-    def log(_msg)
-    end
-
-    def func(name, options = {})
-      options = {
-        duration: :static
-      }.merge(options)
-
-      block_loop(name, options) do |_block, i, group|
-        ins = tests.add(name, options)
-        if group
-          flow.test(group, options) if i == 0
-        else
-          flow.test(ins, options)
-        end
-      end
-    end
-
-    def block_loop(name, options)
-      if options[:by_block]
-        tests.group do |group|
-          group.name = name
-          $nvm.blocks.each_with_index do |block, i|
-            yield block, i, group
-          end
-        end
-      else
-        yield
-      end
-    end
-
-    def por(_options = {})
-    end
-
-    def para(name, options = {})
-      options = {
-        high_voltage: false
-      }.merge(options)
-      ins = tests.add(name, options)
-      ins.dc_category = 'NVM_PARA'
-      flow.test(ins, options)
-    end
-  end
-end