origen 0.7.34 → 0.7.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9fd84e1797329dc7b32f6711451c4492ccb19a3
-  data.tar.gz: a030d5ab1a901cfc90dbd52527832b51bc87d029
+  metadata.gz: 44428e2ccbfc3cd21605f6181962b7962c52f098
+  data.tar.gz: 021be942ef879236ffb661e579ab8372014530f7
 SHA512:
-  metadata.gz: d146624a0ae2a4283da474b4b3b80b8320ec8e80702a427a1c46fda9cf71eae77b1c6ee794e3108ea6b4f48f92691bfec7f8010319ff332c93827536bff2d33d
-  data.tar.gz: c5e8aba422118da126bbbaa9d8356a1b26c95848e4797ca36eb5e272afafd0948acda5b4dc4fa781f91444652436ae0f58232d8ad2579bb9b4ad61f096e7cc0b
+  metadata.gz: 9dd377601afa928bb2ef2a5d1991f730ab373619112c389be8ebd6aefbaac88889a5d50a245a8eb05d2958a459caed54297e28851415ec9e7a4aa8c14f8841bb
+  data.tar.gz: 375b2f1b4ea20532f1488d4c782b4f61bd3202c2b3a2fa5005c0d93b7a26e744913df7e9c5dcb38a8b88dcd6e7102da879eec454133f9208e9ac2749c358846e

data/config/version.rb

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

data/lib/origen/utility.rb

@@ -7,5 +7,86 @@ module Origen
     autoload :InputCapture, 'origen/utility/input_capture'
     autoload :BlockArgs, 'origen/utility/block_args'
     autoload :FileDiff,  'origen/utility/file_diff.rb'
+
+    # Creates a hex-like representation of a register read value, where bits within
+    # a nibble have different flags set the nibble will be expanded to bits
+    #
+    #   read_hex(0x55)              # => "0x55"
+    #   read_hex(nil)               # => "0xX"
+    #
+    #   myreg.size                  # => 32
+    #
+    #   read_hex(myreg)             # =>  "0xXXXXXXXX"
+    #   myreg[7..4].store
+    #   read_hex(myreg)             # =>  "0xXXXXXXSX"
+    #   myreg[23..16].read
+    #   read_hex(myreg)             # =>  "0xXX00XXSX"
+    #   myreg[23..16].read(0x12)
+    #   read_hex(myreg)             # =>  "0xXX12XXSX"
+    #   reg[31..28].overlay("sub")
+    #   reg[31..28].read
+    #   read_hex(myreg)             # =>  "0xVX12XXSX"
+    #   reg[5].clear_flags
+    #   read_hex(myreg)             # =>  "0xVX12XX_ssxs_X"
+    #   reg[21].overlay("sub")
+    #   reg[18].store
+    #   read_hex(myreg)             # =>  "0xVX_00v1_0s10_XX_ssxs_X"
+    def self.read_hex(reg_or_val)
+      if reg_or_val.respond_to?(:data)
+        # Make a binary string of the data, like 010S0011SSSS0110
+        # (where S, X or V represent store, dont care or overlay)
+        regval = ''
+        reg_or_val.shift_out_left do |bit|
+          if bit.is_to_be_stored?
+            regval += 'S'
+          elsif bit.is_to_be_read?
+            if bit.has_overlay?
+              regval += 'V'
+            else
+              regval += bit.data.to_s
+            end
+          else
+            regval += 'X'
+          end
+        end
+
+        # Now group by nibbles to give a hex-like representation, and where nibbles
+        # that are not all of the same type are expanded, e.g. -010s-3S6
+        outstr = ''
+        regex = '^'
+        (reg_or_val.size / 4).times { regex += '(....)' }
+        regex += '$'
+        Regexp.new(regex) =~ regval
+
+        nibbles = []
+        (reg_or_val.size / 4).times do |n|                   # now grouped by nibble
+          nibbles << Regexp.last_match[n + 1]
+        end
+
+        nibbles.each_with_index do |nibble, i|
+          # If contains any special chars...
+          if nibble =~ /[XSV]/
+            # If all the same...
+            if nibble[0] == nibble[1] && nibble[1] == nibble[2] && nibble[2] == nibble[3]
+              outstr += nibble[0, 1] # .to_s
+            # Otherwise present this nibble in 'binary' format
+            else
+              outstr += (i == 0 ? '' : '_') + nibble.downcase + (i == nibbles.size - 1 ? '' : '_')
+            end
+          # Otherwise if all 1s and 0s...
+          else
+            outstr += '%1X' % nibble.to_i(2)
+          end
+        end
+        "0x#{outstr.gsub('__', '_')}"
+
+      else
+        if reg_or_val
+          reg_or_val.to_hex
+        else
+          '0xX'
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.34
+  version: 0.7.35
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport