origen 0.28.2 → 0.29.0

data/lib/origen/value/hex_str_val.rb

@@ -0,0 +1,100 @@
+module Origen
+  class Value
+    # Handles a value represented by a string of hex character(s) [0-9, a-f, x, X, z, Z]
+    #
+    # This is
+    #
+    # * x when all the bits in a nibble are x
+    # * X when some of the bits in a nibble are x, though the exact bit-level values are not known
+    # * z when all the bits in a nibble are z
+    # * Z when some of the bits in a nibble are z, though the exact bit-level values are not known
+    #
+    # Capital hex numbers will be accepted when defining the value, but they will be converted
+    # to lower case
+    class HexStrVal
+      attr_reader :val, :size
+
+      def initialize(value, options)
+        @val = clean(value)
+        if options[:size]
+          @size = options[:size]
+          # Trim any nibbles that are out of range...
+          @val = val.split(//).last(size_in_nibbles).join
+        else
+          @size = (val.size * 4)
+        end
+      end
+
+      def numeric?
+        !!(val =~ /^[0-9a-f]+$/)
+      end
+
+      def to_i
+        if numeric?
+          val.to_i(16) & size.bit_mask
+        end
+      end
+
+      def to_s
+        "h#{val}"
+      end
+
+      # Returns the value of the given bit.
+      # Return nil if out of range, otherwise 0, 1 or an X or Z object
+      def [](index)
+        unless index > (size - 1)
+          if numeric?
+            to_i[index]
+          else
+            # Get the nibble in question and re-align the index, if the bit falls in a numeric
+            # part of the string we can still resolve to an integer
+            nibble = nibble_of(index)
+            nibble = val[val.size - 1 - nibble]
+            if nibble.downcase == 'x'
+              X.new
+            elsif nibble.downcase == 'z'
+              Z.new
+            else
+              nibble.to_i[index % 4]
+            end
+          end
+        end
+      end
+
+      private
+
+      def nibble_of(bit_number)
+        bit_number / 4
+      end
+
+      # Rounds up to the nearest whole nibble
+      def size_in_nibbles
+        adder = size % 4 == 0 ? 0 : 1
+        (size / 4) + adder
+      end
+
+      def clean(val)
+        val = val.to_s.strip.to_s[1..-1]
+        if valid?(val)
+          if val =~ /[A-F]/
+            val = val.gsub('A', 'a')
+            val = val.gsub('B', 'b')
+            val = val.gsub('C', 'c')
+            val = val.gsub('D', 'd')
+            val = val.gsub('E', 'e')
+            val = val.gsub('F', 'f')
+          end
+          val.gsub('_', '')
+        end
+      end
+
+      def valid?(val)
+        if val =~ /^[0-9a-fA-F_xXzZ]+$/
+          true
+        else
+          fail Origen::SyntaxError, 'Hex string values can only contain: 0-9, a-f, A-F, _, x, X, z, Z'
+        end
+      end
+    end
+  end
+end

data/origen_site_config.yml

@@ -21,12 +21,22 @@
 # user (recommended)
 gem_manage_bundler: true
 
-# Define where a typical user's home directory will be, with a hidden directory for Origen.
-home_dir: ~/.origen
+# WORKSPACE DIRECTORY SETUP
 
-# Define where the gems should be installed
-# By default, this will be at <home_dir>/gems but can be overridden here.
-#gem_install_dir: ~/.origen/gems
+# Defines where the home directory is
+#home_dir: ~/
+
+# Defines where the user customization directory is
+#user_install_dir:
+
+# Defines the gems are to be installed
+#user_gem_dir:
+
+# Indicates whether '.origen' should be appended to home_dir
+append_dot_origen: true
+
+# Indicates whether 'gems' should be appended to the user_gem_dir
+append_gems: true
 
 # ORIGEN STARTUP OPTIONS
 # These options define how and where Origen should boot.
@@ -36,9 +46,6 @@ home_dir: ~/.origen
 # control over their environment.
 user_install_enable: false
 
-# Default to the user's install dir being the .origen in their home directory but allow it to be overridden
-#user_install_dir: ~/.origen
-
 # Default 'tool_repo_install_dir' to nil, meaning no 'tool_repo_install_dir' is present. If neither this nor 
 # 'user_install_enable' is present, the universal install will be used.
 #tool_repo_install_dir: nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.29.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -457,10 +457,9 @@ files:
 - lib/origen/controller.rb
 - lib/origen/core_ext.rb
 - lib/origen/core_ext/array.rb
-- lib/origen/core_ext/bignum.rb
 - lib/origen/core_ext/enumerable.rb
-- lib/origen/core_ext/fixnum.rb
 - lib/origen/core_ext/hash.rb
+- lib/origen/core_ext/integer.rb
 - lib/origen/core_ext/module.rb
 - lib/origen/core_ext/numeric.rb
 - lib/origen/core_ext/object.rb
@@ -491,6 +490,7 @@ files:
 - lib/origen/generator/renderer.rb
 - lib/origen/generator/resources.rb
 - lib/origen/generator/stage.rb
+- lib/origen/global_app.rb
 - lib/origen/global_methods.rb
 - lib/origen/location.rb
 - lib/origen/location/base.rb
@@ -509,6 +509,9 @@ files:
 - lib/origen/netlist/connectable.rb
 - lib/origen/netlist/list.rb
 - lib/origen/operating_systems.rb
+- lib/origen/org_file.rb
+- lib/origen/org_file/interceptable.rb
+- lib/origen/org_file/interceptor.rb
 - lib/origen/parameters.rb
 - lib/origen/parameters/live.rb
 - lib/origen/parameters/missing.rb
@@ -580,6 +583,9 @@ files:
 - lib/origen/utility/input_capture.rb
 - lib/origen/utility/mailer.rb
 - lib/origen/utility/time_and_date.rb
+- lib/origen/value.rb
+- lib/origen/value/bin_str_val.rb
+- lib/origen/value/hex_str_val.rb
 - lib/origen/version_string.rb
 - lib/tasks/gem.rake
 - lib/tasks/private/build.rake
@@ -623,7 +629,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -631,7 +637,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit

data/lib/origen/core_ext/bignum.rb

@@ -1,38 +0,0 @@
-unless Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
-  class Bignum
-    # Extend Fixnum to enable 10.cycles
-    def cycles
-      if block_given?
-        times do
-          yield
-          Origen.app.tester.cycle
-        end
-      else
-        Origen.app.tester.cycle(repeat: self)
-      end
-    end
-    alias_method :cycle, :cycles
-
-    alias_method :old_bit_select, :[]
-    def [](*args)
-      if args.length == 1 && !args.first.is_a?(Range)
-        old_bit_select(args.first)
-      else
-        if args.first.is_a?(Range)
-          msb = args.first.first
-          lsb = args.first.last
-        else
-          msb = args.first
-          lsb = args.last
-        end
-        (self >> lsb) & 0.ones_comp(msb - lsb + 1)
-      end
-    end
-
-    def ones_comp(num_bits)
-      self ^ ((1 << num_bits) - 1)
-    end
-    alias_method :ones_complement, :ones_comp
-    alias_method :ones_compliment, :ones_comp
-  end
-end

data/lib/origen/core_ext/fixnum.rb

@@ -1,56 +0,0 @@
-class Fixnum
-  # Extend Fixnum to enable 10.cycles
-  def cycles
-    if block_given?
-      times do
-        yield
-        Origen.app.tester.cycle
-      end
-    else
-      Origen.app.tester.cycle(repeat: self)
-    end
-  end
-  alias_method :cycle, :cycles
-
-  alias_method :old_bit_select, :[]
-  def [](*args)
-    if args.length == 1 && !args.first.is_a?(Range)
-      old_bit_select(args.first)
-    else
-      if args.first.is_a?(Range)
-        msb = args.first.first
-        lsb = args.first.last
-      else
-        msb = args.first
-        lsb = args.last
-      end
-      (self >> lsb) & 0.ones_comp(msb - lsb + 1)
-    end
-  end
-
-  def ones_comp(num_bits)
-    self ^ ((1 << num_bits) - 1)
-  end
-  alias_method :ones_complement, :ones_comp
-  alias_method :ones_compliment, :ones_comp
-
-  def to_bool
-    if self == 1
-      return true
-    elsif self == 0
-      return false
-    else
-      return nil
-    end
-  end
-
-  def to_spreadsheet_column
-    index_hash = Hash.new { |hash, key| hash[key] = hash[key - 1].next }.merge(0 => 'A')
-    index_hash[self]
-  end
-  alias_method :to_xls_column, :to_spreadsheet_column
-  alias_method :to_xlsx_column, :to_spreadsheet_column
-  alias_method :to_xls_col, :to_spreadsheet_column
-  alias_method :to_xlsx_col, :to_spreadsheet_column
-  alias_method :to_spreadsheet_col, :to_spreadsheet_column
-end