origen 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c220c4b98134c25059399a9c5f8f9719ad39a6d0
-  data.tar.gz: 1faed96ffe8651f6d49f8e3932a3ab17b0d28e38
+  metadata.gz: d127d3c6a39b412a8556608b10b6ec2ef9a1ccaa
+  data.tar.gz: fa1b288892a6654704aed6a79ae29cb7c4f3af83
 SHA512:
-  metadata.gz: '01218847dde5ecd45712e55138007b7d2157e6390445f308759be1a0d53d2adbec7167394cbd4cc34efabcf674d42c43e08695140b91b582436fe2a557a1525b'
-  data.tar.gz: 93747cc9c2559141f4c4d8cf3378a715a0874db7928093973eeb070c1a1354b62ddd6f15b7e91a5828794d03a1953ae8c47ea5426ef293176265040e0bcd9d8d
+  metadata.gz: edae522a13effe32a3fa24b6f28c85587cd108f24d63f7f3543221e5c656dc227e77500d632e25559e87fb76cf7166737a502aa7e2500601538d95cb07051564
+  data.tar.gz: 0431396fa522702e504b037a11aeec790cc7500d1853366e8be3e8e27a56f5642bd0bbf98b8f0b0c11050786831872a7253577e7d4de5cc534dd9cc68a307ef8

data/bin/origen

@@ -178,7 +178,9 @@ rescue Exception => e
   # case the application code is responsible for printing a helpful error message.
   # This will intercept all other exits, e.g. via 'fail "Something has done wrong"', and split the stack
   # dump to separate all in-application references from Origen core/plugin references.
-  unless e.is_a?(SystemExit)
+  if e.is_a?(SystemExit)
+    exit e.status
+  else
     puts
     if Origen.app_loaded?
       puts 'COMPLETE CALL STACK'

data/config/application.rb

@@ -26,6 +26,14 @@ class OrigenCoreApplication < Origen::Application
     #:files => ["lib", "config/application.rb"],
   }
 
+  config.remotes = [
+    {
+      dir: "origen_app_generators",
+      rc_url: "https://github.com/Origen-SDK/origen_app_generators.git",
+      version: "1006fe8",
+    }
+  ]
+
   #config.lsf.project = "origen core"
   
   config.web_directory = "git@github.com:Origen-SDK/Origen-SDK.github.io.git/origen"

data/config/version.rb

@@ -1,6 +1,6 @@
 module Origen
   MAJOR = 0
-  MINOR = 22
+  MINOR = 23
   BUGFIX = 0
   DEV = nil
 

data/lib/c99/nvm.rb

@@ -101,6 +101,10 @@ module C99
         bits 13..8, :upper, description: 'This is dreg3 bit upper'
         bit 7..0,  :lower, writable: false, reset: 0x55, description: "This is dreg3 bit lower\nThis is dreg3 bit lower line 2"
       end
+
+      reg :dreg4, 0x1000, size: 8, description: "** Data Register 4 **\nThis is dreg4" do
+        bit 7..0, :busy, reset: 0x55, description: "**Busy Bits** - These do something super cool\n\n0 | Job0\n1 | Job1\n10 | Job2\n11 | Job3\n100 | Job4\n101 | Job5\n110 | Job6\n111 | Job7\n1000 | Job8\n1001 | Job9\n1010 | Job10\n1011 | Job11\n1100 | Job12\n1101 | Job13\n1110 | Job14\n1111 | Job15\n10000 | Job16\n10001 | Job17\n10010 | Job18"
+      end
     end
   end
 end

data/lib/origen.rb

@@ -4,6 +4,10 @@ unless defined? RGen::ORIGENTRANSITION
   require 'English'
   require 'pathname'
   require 'pry'
+  # require these here to make required files consistent between global commands invoke globally and global commands
+  # invoked from an application workspace
+  require 'colored'
+  require 'fileutils'
   # Keep a note of the pwd at the time when Origen was first loaded, this is initially used
   # by the site_config lookup.
   $_origen_invocation_pwd ||= Pathname.pwd
@@ -587,12 +591,13 @@ unless defined? RGen::ORIGENTRANSITION
       # Use User.current to retrieve the current user, this is an internal API that will
       # be cleaned up (removed) in future
       # @api private
-      def current_user
+      def current_user(options = {})
+        @current_user = nil if options[:refresh]
         if app_loaded? || in_app_workspace?
           return @switch_user unless @switch_user.nil?
-          application.current_user
+          @current_user ||= application.current_user
         else
-          User.new(User.current_user_id)
+          @current_user ||= User.new(User.current_user_id)
         end
       end
 

data/lib/origen/commands/web.rb

@@ -135,13 +135,14 @@ The following options are available:
     when 'new'
       _build_web_dir
     when 'compile'
-      Origen.app.load_target!
       if options[:remote]
+        Origen.app.load_target!
         _require_web_directory
         _deployer.prepare!(options)
         # If the whole site has been requested that start from a clean slate
         _build_web_dir if ARGV.empty?
       else
+        Origen.app.load_target!(force_debug: true)
         Origen.set_development_mode
       end
       options[:files] = ARGV.dup

data/lib/origen/core_ext/numeric.rb

@@ -29,6 +29,40 @@ class Numeric
     result
   end
 
+  def as_units(units)
+    if self >= 1_000_000_000_000_000
+      "#{self / 1_000_000_000_000_000.0}P#{units}"
+    elsif self >= 1_000_000_000_000
+      "#{self / 1_000_000_000_000.0}T#{units}"
+    elsif self >= 1_000_000_000
+      "#{self / 1_000_000_000.0}G#{units}"
+    elsif self >= 1_000_000
+      "#{self / 1_000_000.0}M#{units}"
+    elsif self >= 1_000
+      "#{self / 1_000.0}k#{units}"
+    elsif self >= 1
+      "#{self}#{units}"
+    elsif self >= 1e-3
+      "#{self * 1_000}m#{units}"
+    elsif self >= 1e-6
+      "#{self * 1_000_000}u#{units}"
+    elsif self >= 1e-9
+      "#{self * 1_000_000_000}n#{units}"
+    elsif self >= 1e-12
+      "#{self * 1_000_000_000_000}p#{units}"
+    elsif self >= 1e-15
+      "#{self * 1_000_000_000_000_000}a#{units}"
+    else
+      "%.3e#{units}" % self
+    end
+  end
+
+  %w(Hz hz Ts ts bps sps ohm Ohm a A v V s S).each do |m|
+    define_method "as_#{m}" do
+      as_units(m)
+    end
+  end
+
   # Msps ==> Mega samples per second
 
   %w(GHz Ghz GTs Gts Gsps).each do |m|

data/lib/origen/registers.rb

@@ -507,8 +507,10 @@ module Origen
     end
     alias_method :has_reg, :has_reg?
 
-    # Returns the register object matching the given name, or a hash of all registers,
-    # associated with a feature,if no name is specified.
+    # Returns
+    #  -the register object matching the given name
+    #  -or a hash of all registes matching a given regular expression
+    #  -or a hash of all registers, associated with a feature, if no name is specified.
     #
     # Can also be used to define a new register if a block is supplied in which case
     # it is equivalent to calling add_reg with a block.
@@ -520,6 +522,7 @@ module Origen
         # Example use cases:
         # reg(:reg2)
         # reg(:name => :reg2)
+        # reg('/reg2/')
         if !args.empty? && args.size == 1 && (args[0].class != Hash || (args[0].key?(:name) && args[0].size == 1))
           if args[0].class == Hash
             name = args[0][:name]
@@ -527,6 +530,9 @@ module Origen
           end
           if has_reg(name)
             return _registers[name]
+          elsif name =~ /\/(.+)\//
+            regex = Regexp.last_match(1)
+            return match_registers(regex)
           else
             if Origen.config.strict_errors
               puts ''
@@ -593,6 +599,15 @@ module Origen
 
     private
 
+    def match_registers(regex)
+      regs_to_return = RegCollection.new(self)
+      _registers.each do |k, v|
+        regs_to_return[k] = v if k.to_s.match(/#{regex}/)
+      end
+      regs_to_return
+    end
+    alias_method :regs_match, :match_registers
+
     def reg_missing_error(params)
       if Origen.config.strict_errors
         puts ''

data/lib/origen/registers/bit_collection.rb

@@ -225,10 +225,11 @@ module Origen
       end
 
       def bit_value_descriptions(_bitname = nil)
+        options = _bitname.is_a?(Hash) ? _bitname : {}
         if name == :unknown
           []
         else
-          @reg.bit_value_descriptions(name)
+          @reg.bit_value_descriptions(name, options)
         end
       end
 

data/lib/origen/remote_manager.rb

@@ -216,9 +216,7 @@ module Origen
       @remotes = {}
       top_level_remotes
       top_level_remotes.each do |remote|
-        traverse_remotes(remote) do |remote|
-          add_remote(remote)
-        end
+        add_remote(remote)
       end
       # Add remotes from imports
       Origen.app.plugins.each do |plugin|
@@ -233,31 +231,10 @@ module Origen
       Origen.app.config.remotes    #+ Origen.app.config.remotes_dev (there are no core remotes at this time)
     end
 
-    # Walks down an import tree recursively yielding all nested imports, if
-    # the imported application has not been populated yet then it will
-    # not return any nested imports.
-    #
-    # This will also update the required origen version if a app
-    # instance is encountered that requires a newer version than the current
-    # version.
-    def traverse_remotes(remote, &block)
-      yield remote
-      if remote_present?(remote)
-        app = Origen.application_instance(origen_root_for(remote), reload: true)
-        app.config.remotes.each do |remote|
-          traverse_remotes(remote, &block)
-        end
-      end
-    end
-
     def remotes
       @remotes ||= resolve_remotes
     end
 
-    def remote_present?(remote)
-      !!origen_root_for(remote, accept_missing: true)
-    end
-
     # Conflicts are resolved by the following rules:
     #   * A path reference always wins.
     #   * If two different paths are found an errors will be raised.

data/lib/origen/revision_control/design_sync.rb

@@ -316,6 +316,7 @@ module Origen
               # Screen out common redundant output
               unless line =~ /^Logging/ || line == '' ||
                      line =~ /V(\d+\.\d+-\d+|\d.\d+)/ || # Screen out something like "V5.1-1205" or "V6R2010"
+                     line =~ /^3DEXPERIENCER\d+x$/ || # Screen out something like '3DEXPERIENCER2016x'
                      line.strip.empty?
                 output << line.strip
               end

data/lib/origen/sub_blocks.rb

@@ -241,6 +241,7 @@ module Origen
         false
       end
     end
+    alias_method :has_regs?, :owns_registers?
 
     def sub_block(name, options = {})
       if i = options.delete(:instances)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -603,7 +603,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit