cross_origen 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5e7b5c2e2e62729143d48392467fbbf5903885f
-  data.tar.gz: 421c909d4b31cfe7614084194c06650b179ebd15
+  metadata.gz: 2f7582c611769181fb35ca1c63a9de7d0b91fb55
+  data.tar.gz: 12b85146240f75f5135419ef20420a9cc5f1ca20
 SHA512:
-  metadata.gz: 316821d70b48bf422ecdfd736512bc232be143db822a8a0c7022a195ad8003cd01de2d796a861f73320cc4ee59b8c81fb4fb3cee0ac1a6f1ce4eace3df7a2712
-  data.tar.gz: 803e9134ff9c1ed944f4529d0f84a73a53ea69d11b5252f7ab80f03e0d319577fed8497e4674221793662c51530cda1b68171acaf20d1338de4c8f1a88762282
+  metadata.gz: fd24d373d4d19d60f230db4d84feddf85eae354c2699a2f8405c0188e98d4cf0c926f1f8cb51f92bfe00d82a3eb3df9a9a94b6471f6e7584e86469aaee925017
+  data.tar.gz: 4a4143ef8cfef70ea40eed6a13859b329687b47cf19eee009416f480afa4eaebb552610c03372b7af6ca7dd5fc3bf0602f55f23dff07bed145902b0d0c115dd6

data/config/version.rb

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

data/lib/cross_origen/ip_xact.rb

@@ -52,7 +52,7 @@ module CrossOrigen
                 # Do a logical bitwise AND with the reset value and mask
                 reset_value = reset_value & reset_mask
               end
-              addr_block_obj.reg name, addr_offset, size: size, access: access do |reg|
+              addr_block_obj.reg name, addr_offset, size: size, access: access, description: reg_description(register) do |reg|
                 register.xpath('spirit:field').each do |field|
                   name = fetch field.at_xpath('spirit:name'), downcase: true, to_sym: true, get_text: true
                   bit_offset = fetch field.at_xpath('spirit:bitOffset'), get_text: true, to_i: true
@@ -71,7 +71,7 @@ module CrossOrigen
                   else
                     range = (bit_offset + bit_width - 1)..bit_offset
                   end
-                  reg.bit range, name, reset: reset_value[range], access: access
+                  reg.bit range, name, reset: reset_value[range], access: access, description: bit_description(field)
                 end
               end
             end
@@ -191,6 +191,27 @@ module CrossOrigen
 
     private
 
+    def reg_description(register)
+      fetch register.at_xpath('spirit:description'), get_text: true, whitespace: true
+    end
+
+    def bit_description(bit)
+      desc = fetch(bit.at_xpath('spirit:description'), get_text: true, whitespace: true) || ''
+      bit_val_present = false
+      bit.xpath('spirit:values').each do |val|
+        unless bit_val_present
+          desc += "\n"
+          bit_val_present = true
+        end
+        value = extract(val, 'spirit:value', format: :integer, hex: true)
+        value_desc = extract val, 'spirit:description'
+        if value && value_desc
+          desc += "\n#{value.to_s(2)} | #{value_desc}"
+        end
+      end
+      desc
+    end
+
     def mask(reg)
       m = 0
       reg.size.times do |i|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cross_origen
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Stephen McGinty