cross_origen 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aa045609ddda2f3de9f4fe4851f7ab31201e2b1bfcf2021caffabe3b0f0a3bd
-  data.tar.gz: a34da76233dad5ad6110c6632a0061b9b5092f380922effc4ad537c998adf6cf
+  metadata.gz: 22b8f1762b75a8679be92a19f549aa4cf0da1849bbd5dfbc5713163e32534b27
+  data.tar.gz: e618175099f2025422bee4cc92c5286ea5dae03517f8d0c72230ddaf496ebabb
 SHA512:
-  metadata.gz: ac3d2456ce9fa735d504a76640a5cd6b68901eb7d1c669bef46057d3f404c06186f3da57f2c47ad0dc2993180dcf892c874a12db6d7f0bc2a28a5bb2d1707035
-  data.tar.gz: 58941b7e05d5c9e82eaccf8057d823e6ddb5380c24aaf2e97cbaa2788a935f29b52d215b2035941b24135ed70768094bc9d169874605ac391d6ba83574181c15
+  metadata.gz: 323c13ef959afbd8334bd39534f3ca19d1dd573ef43384fb8f848e0633a4e136269a1f32f10b1727f5668c5a3590c064c74f7cc5790e3ae52acaafe317dbb63c
+  data.tar.gz: 8d957c81ee5f9ddadc10b297576755b66f923e177887f24c3d76fc53f6215cd572e2a30e3bd2b2a3f2c606562518b61f995b6dec5fc7d6e46e5481af26684d47

data/config/version.rb

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

data/lib/cross_origen/ip_xact.rb

@@ -168,6 +168,7 @@ xsi:schemaLocation="$REGMEM_HOME/builder/ipxact/schema/ipxact
     #   :bus_interface      = only 'AMBA3' supported at this time
     #   :mmap_name          = Optionally set the memoryMap name to something other than the module name
     #   :mmap_ref           = memoryMapRef name, ex: 'UserMap'
+    #   :addr_block_name    = addressBlock -> Name, ex: 'ATX'
     def owner_to_xml(options = {})
       require 'nokogiri'
 
@@ -257,7 +258,11 @@ xsi:schemaLocation="$REGMEM_HOME/builder/ipxact/schema/ipxact
                   spirit.addressBlock do
                     # When registers reside at the top level, do not assign an address block name
                     if sub_block == owner
-                      spirit.name nil
+                      if options[:addr_block_name].nil?
+                        spirit.name nil
+                      else
+                        spirit.name options[:addr_block_name]
+                      end
                     else
                       spirit.name address_block_name(domain_name, sub_block)
                     end
@@ -324,9 +329,8 @@ xsi:schemaLocation="$REGMEM_HOME/builder/ipxact/schema/ipxact
                             # greatly between devices, allow the user to provide an abs_path value
                             # and define "full_reg_path" to assist.
                             #
-                            # When registers reside at the top level of the memory map, assume "top"
-                            # for the register path name.  (Need to improve this process in the future.)
-                            if reg.owner.top_level? == true
+                            # When registers reside at the top level without a specified path, use 'top'.
+                            if reg.owner.path.nil? || reg.owner.path.empty?
                               regpath = 'top'
                             else
                               regpath = reg.owner.path
@@ -406,7 +410,11 @@ xsi:schemaLocation="$REGMEM_HOME/builder/ipxact/schema/ipxact
                 end
                 # Assume byte addressing if not specified
                 if owner.methods.include?(:lau) == false
-                  spirit.addressUnitBits 8
+                  if methods.include?(:lau) == true
+                    spirit.addressUnitBits lau
+                  else
+                    spirit.addressUnitBits 8
+                  end
                 else
                   spirit.addressUnitBits owner.lau
                 end
@@ -423,7 +431,6 @@ xsi:schemaLocation="$REGMEM_HOME/builder/ipxact/schema/ipxact
       #
       builder.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::NO_EMPTY_TAGS |
                                 Nokogiri::XML::Node::SaveOptions::FORMAT)
-      # builder.to_xml
     end
 
     private

data/lib/cross_origen_dev/dut.rb

@@ -70,6 +70,10 @@ module CrossOrigenDev
           # 0 | Clock is the externally supplied bus clock bus_clk
           # 1 | Clock is the internal oscillator from the hardblock
           bit 15, :osch, reset: 1, access: :rw
+          # **Divider Value**
+          #
+          # Used to set clock divider value and test multi-bit import in CrossOrigen
+          bits 3..0, :div
         end
 
         # **Access Type Test Register**

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cross_origen
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen