cross_origen 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20fb4952ec7d0da9dcad3673c0442cbc1b79afc3
-  data.tar.gz: 8b55d120f0783322f057ba2db4fc638d063f1443
+  metadata.gz: d5e7b5c2e2e62729143d48392467fbbf5903885f
+  data.tar.gz: 421c909d4b31cfe7614084194c06650b179ebd15
 SHA512:
-  metadata.gz: 513b242817d94cd5b7f7614ca14087150e9e5cbcad31995e9eea344493d35bf525a6b9d52a268702b0d3ec73b44f31338d0d755e80b30fbcfec1d6a4183fe038
-  data.tar.gz: 9b767385a47a1f14319b4c22e4feb4c575f4aef07f615a70f376f12998623921642eff97e9b8dc9940b4248a7074b78923c81ebf76fc64dde058bc5c3cd1cc7e
+  metadata.gz: 316821d70b48bf422ecdfd736512bc232be143db822a8a0c7022a195ad8003cd01de2d796a861f73320cc4ee59b8c81fb4fb3cee0ac1a6f1ce4eace3df7a2712
+  data.tar.gz: 803e9134ff9c1ed944f4529d0f84a73a53ea69d11b5252f7ab80f03e0d319577fed8497e4674221793662c51530cda1b68171acaf20d1338de4c8f1a88762282

data/config/version.rb

@@ -1,6 +1,6 @@
 module CrossOrigen
   MAJOR = 0
-  MINOR = 5
+  MINOR = 6
   BUGFIX = 0
   DEV = nil
 

data/lib/cross_origen/ip_xact.rb

@@ -21,15 +21,23 @@ module CrossOrigen
         end
         doc.xpath('//spirit:memoryMaps/spirit:memoryMap').each do |mem_map|
           mem_map_name = fetch mem_map.at_xpath('spirit:name'), downcase: true, to_sym: true, get_text: true
-          owner.sub_block mem_map_name
-          mem_map_obj = owner.send(mem_map_name)
+          if mem_map_name.to_s.empty?
+            mem_map_obj = owner
+          else
+            owner.sub_block mem_map_name
+            mem_map_obj = owner.send(mem_map_name)
+          end
           mem_map.xpath('spirit:addressBlock').each do |addr_block|
             name = fetch addr_block.at_xpath('spirit:name'), downcase: true, to_sym: true, get_text: true
             base_address = fetch addr_block.at_xpath('spirit:baseAddress'), get_text: true, to_dec: true
             range = fetch addr_block.at_xpath('spirit:range'), get_text: true, to_dec: true
             width = fetch addr_block.at_xpath('spirit:width'), get_text: true, to_i: true
-            mem_map_obj.sub_block name, base_address: base_address, range: range, lau: width
-            addr_block_obj = mem_map_obj.send(name)
+            if name.to_s.empty?
+              addr_block_obj = mem_map_obj
+            else
+              mem_map_obj.sub_block name, base_address: base_address, range: range, lau: width
+              addr_block_obj = mem_map_obj.send(name)
+            end
             addr_block.xpath('spirit:register').each do |register|
               name = fetch register.at_xpath('spirit:name'), downcase: true, to_sym: true, get_text: true
               size = fetch register.at_xpath('spirit:size'), get_text: true, to_i: true
@@ -74,7 +82,7 @@ module CrossOrigen
 
     # Returns a string representing the owner object in IP-XACT XML
     def owner_to_xml(options = {})
-      require 'builder'
+      require 'nokogiri'
 
       options = {
         include_bit_field_values: true
@@ -82,10 +90,6 @@ module CrossOrigen
 
       @format = options[:format]
 
-      xml = Builder::XmlMarkup.new(indent: 2, margin: 0)
-
-      xml.instruct!
-
       schemas = [
         'http://www.spiritconsortium.org/XMLSchema/SPIRIT/1.4',
         'http://www.spiritconsortium.org/XMLSchema/SPIRIT/1.4/index.xsd'
@@ -103,69 +107,77 @@ module CrossOrigen
         headers['xmlns:vendorExtensions'] = '$IREG_GEN/XMLSchema/SPIRIT'
       end
 
-      xml.tag!('spirit:component', headers) do
-        xml.spirit :vendor, options[:vendor] || 'Freescale'
-        xml.spirit :library, options[:library] || 'Freescale'
-        # I guess this should really be the register owner's owner's name?
-        xml.spirit :name, try(:ip_name, :pdm_part_name) || owner.class.to_s.split('::').last
-        xml.spirit :version, try(:ip_version, :pdm_version, :pdm_cm_version, :version, :revision)
-        xml.spirit :memoryMaps do
-          memory_maps.each do |map_name, _map|
-            xml.spirit :memoryMap do
-              xml.spirit :name, map_name
-              address_blocks do |domain_name, _domain, sub_block|
-                xml.spirit :addressBlock do
-                  xml.spirit :name, address_block_name(domain_name, sub_block)
-                  xml.spirit :baseAddress, sub_block.base_address.to_hex
-                  xml.spirit :range, range(sub_block)
-                  xml.spirit :width, width(sub_block)
-                  sub_block.regs.each do |name, reg|
-                    # Required for now to ensure that the current value is the reset value
-                    reg.reset
-                    xml.spirit :register do
-                      xml.spirit :name, name
-                      xml.spirit :description, try(reg, :name_full, :full_name)
-                      xml.spirit :addressOffset, reg.offset.to_hex
-                      xml.spirit :size, reg.size
-                      if reg.bits.any?(&:writable?)
-                        xml.spirit :access, 'read-write'
-                      else
-                        xml.spirit :access, 'read-only'
-                      end
-                      xml.spirit :reset do
-                        xml.spirit :value, reg.data.to_hex
-                        xml.spirit :mask, mask(reg).to_hex
-                      end
-                      reg.named_bits do |name, bits|
-                        xml.spirit :field do
-                          xml.spirit :name, name
-                          xml.spirit :description, try(bits, :brief_description, :name_full, :full_name)
-                          xml.spirit :bitOffset, bits.position
-                          xml.spirit :bitWidth, bits.size
-                          xml.spirit :access, bits.access
-                          if options[:include_bit_field_values]
-                            if bits.bit_value_descriptions[0]
-                              bits.bit_value_descriptions.each do |val, desc|
-                                xml.spirit :values do
-                                  xml.spirit :value, val.to_hex
-                                  xml.spirit :name, "val_#{val.to_hex}"
-                                  xml.spirit :description, desc
+      builder = Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
+        spirit = xml['spirit']
+        spirit.component(headers) do
+          spirit.vendor options[:vendor] || 'Origen'
+          spirit.library options[:library] || 'Origen'
+          # I guess this should really be the register owner's owner's name?
+          spirit.name try(:ip_name) || owner.class.to_s.split('::').last
+          spirit.version try(:ip_version, :version, :revision)
+          spirit.memoryMaps do
+            memory_maps.each do |map_name, _map|
+              spirit.memoryMap do
+                spirit.name map_name
+                address_blocks do |domain_name, _domain, sub_block|
+                  spirit.addressBlock do
+                    if sub_block == owner
+                      spirit.name nil
+                      spirit.baseAddress 0.to_hex
+                    else
+                      spirit.name address_block_name(domain_name, sub_block)
+                      spirit.baseAddress sub_block.base_address.to_hex
+                    end
+                    spirit.range range(sub_block)
+                    spirit.width width(sub_block)
+                    sub_block.regs.each do |name, reg|
+                      # Required for now to ensure that the current value is the reset value
+                      reg.reset
+                      spirit.register do
+                        spirit.name name
+                        spirit.description try(reg, :name_full, :full_name)
+                        spirit.addressOffset reg.offset.to_hex
+                        spirit.size reg.size
+                        if reg.bits.any?(&:writable?)
+                          spirit.access 'read-write'
+                        else
+                          spirit.access 'read-only'
+                        end
+                        spirit.reset do
+                          spirit.value reg.data.to_hex
+                          spirit.mask mask(reg).to_hex
+                        end
+                        reg.named_bits do |name, bits|
+                          spirit.field do
+                            spirit.name name
+                            spirit.description try(bits, :brief_description, :name_full, :full_name)
+                            spirit.bitOffset bits.position
+                            spirit.bitWidth bits.size
+                            spirit.access bits.access
+                            if options[:include_bit_field_values]
+                              if bits.bit_value_descriptions[0]
+                                bits.bit_value_descriptions.each do |val, desc|
+                                  spirit.values do
+                                    spirit.value val.to_hex
+                                    spirit.name "val_#{val.to_hex}"
+                                    spirit.description desc
+                                  end
                                 end
                               end
                             end
-                          end
-                          if uvm?
-                            xml.spirit :vendorExtensions do
-                              xml.vendorExtensions :hdl_path, bits.path(relative_to: sub_block)
+                            if uvm?
+                              spirit.vendorExtensions do
+                                xml['vendorExtensions'].hdl_path bits.path(relative_to: sub_block)
+                              end
                             end
                           end
                         end
                       end
                     end
-                  end
-                  if uvm?
-                    xml.spirit :vendorExtensions do
-                      xml.vendorExtensions :hdl_path, sub_block.path(relative_to: owner)
+                    if uvm?
+                      spirit.vendorExtensions do
+                        xml['vendorExtensions'].hdl_path sub_block.path(relative_to: owner)
+                      end
                     end
                   end
                 end
@@ -174,6 +186,7 @@ module CrossOrigen
           end
         end
       end
+      builder.to_xml
     end
 
     private
@@ -193,7 +206,7 @@ module CrossOrigen
     end
 
     def memory_maps
-      { owner.name => {} }
+      { nil => {} }
     end
 
     def sub_blocks(domain_name)
@@ -207,6 +220,9 @@ module CrossOrigen
       domains = owner.register_domains
       domains = { default: {} } if domains.empty?
       domains.each do |domain_name, domain|
+        if owner.owns_registers?
+          yield domain_name, domain, owner
+        end
         sub_blocks(domain_name).each do |sub_block|
           yield domain_name, domain, sub_block
         end

data/lib/cross_origen/test/dut.rb

@@ -7,7 +7,7 @@ module CrossOrigen
 
       def initialize
         @path = :hidden
-        sub_block :atx, class_name: 'D_IP_ANA_TEST_ANNEX_SYN'
+        sub_block :atx, class_name: 'D_IP_ANA_TEST_ANNEX_SYN', base_address: 0x4000_0000
 
         # Register defined solely to test out the top level register export
         reg :dut_top_level_reg, 0x0, size: 32, bit_order: :msb0, lau: 8 do
@@ -23,6 +23,19 @@ module CrossOrigen
         cr_import(path: "#{Origen.root}/imports/ipxact.xml")
       end
 
+      def add_atx2
+        sub_block :atx2, class_name: 'ATX2', base_address: 0x6000_0000
+      end
+
+      class ATX2
+        include Origen::Model
+        include CrossOrigen
+
+        def initialize
+          cr_import(path: "#{Origen.root}/approved/ip_xact_sub_block.xml")
+        end
+      end
+
       class D_IP_ANA_TEST_ANNEX_SYN # rubocop:disable ClassAndModuleCamelCase
         include Origen::Model
         include CrossOrigen

data/templates/test/ip_xact_sub_block.xml.erb

@@ -0,0 +1 @@
+<%= $dut.atx.to_ip_xact %>

data/templates/web/layouts/_basic.html.erb

@@ -1,5 +1,6 @@
 ---
 title: <%= options[:title] || Origen.config.name %>
+analytics: UA-64455560-1
 ---
 <%= render "templates/web/partials/navbar.html", tab: options[:tab] %>
 
@@ -9,5 +10,7 @@ title: <%= options[:title] || Origen.config.name %>
   <div class="span12" markdown="1">
 <%= yield %>    
 
+<%= disqus_comments %>
+
 </div>
 </div>

data/templates/web/partials/_navbar.html.erb

@@ -15,7 +15,7 @@
         <li class="<%= options[:tab] == :api ? 'active' : '' %>"><a href="<%= path "/api/" %>">API</a></li>
         <li class="<%= options[:tab] == :coverage ? 'active' : '' %>"><a href="<%= path "/coverage" %>">Coverage</a></li>
         <li class="<%= options[:tab] == :release ? 'active' : '' %>"><a href="<%= path "/release_notes" %>">Release Notes</a></li>
-        <li><a href="https://github.com/Origen-SDK/origen_jtag">Github</a></li>
+        <li><a href="https://github.com/Origen-SDK/cross_origen">Github</a></li>
       </ul>
       <%= import "origen/web/logo.html" %>
     </div><!--/.nav-collapse -->

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cross_origen
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -79,6 +79,7 @@ files:
 - templates/test/default.ralf.erb
 - templates/test/headers_default.h.erb
 - templates/test/ip_xact.xml.erb
+- templates/test/ip_xact_sub_block.xml.erb
 - templates/web/_history.md
 - templates/web/example.md.erb
 - templates/web/examples.md.erb
@@ -87,7 +88,6 @@ files:
 - templates/web/examples/ralf_export.md.erb
 - templates/web/index.md.erb
 - templates/web/layouts/_basic.html.erb
-- templates/web/layouts/_doc.html.erb
 - templates/web/partials/_navbar.html.erb
 - templates/web/release_notes.md.erb
 homepage: http://origen-sdk.org/cross_origen
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Translators for importing and exporting Origen data to/from 3rd party formats

data/templates/web/layouts/_doc.html.erb

@@ -1,61 +0,0 @@
----
-title: <%= options[:title] || Origen.config.name %>
----
-<%= render "templates/web/partials/navbar.html", tab: :docs %>
-
-%# Add/edit sections here, the code below will expand this with the correct markup, 
-%# pass in the topic you want selected via the :tab option.
-% s = {}
-% s["Environment"] = {
-%   environment_introduction: "Introduction",
-%   environment_installation: "Installation",
-%   environment_definitions: "Definitions and Acronyms",
-% }
-% s["Targets"] = {
-%   targets_introduction: "Introduction",
-%   targets_supported: "Supported",
-% }
-% s["Developers"] = {
-%   developers_branching: "Making Branches",
-% }
-
-
-
-<div class="row">
-  <div class="span3">
-    <div class="well sidebar-nav">
-        <div class="accordion" id="sidebar-accordion">
-
-% s.each_with_index do |(subject, sections), i|          
-          <div class="accordion-group">
-            <div class="accordion-heading">
-              <a class="accordion-toggle" data-toggle="collapse" data-parent="#sidebar-accordion" href="#sidebar-collapse-<%= i %>">
-                <%= subject %>
-              </a>
-            </div>
-            <div id="sidebar-collapse-<%= i %>" class="accordion-body collapse <%= sections.has_key?(options[:tab]) ? 'in' : '' %>">
-              <div class="accordion-inner">
-                <ul class="nav nav-list">
-%   sections.each do |tab, section|
-% paths = tab.to_s.split("_")
-<li class="<%= tab == options[:tab] ? 'active' : '' %>"><a href="<%= path "/docs/#{paths[0]}/#{paths[1]}" %>"><%= section %></a></li>
-%   end          
-                </ul>
-              </div>
-            </div>
-          </div>
-% end          
-
-        </div>
-
-    </div>
-  </div>
-
-%# The markdown attribute is important if you are going to include content written
-%# in markdown, without this is will be included verbatim
-  <div class="span9" markdown="1">
-<%= yield %>    
-%# Also important to avoid indentation on return here, since otherwise it could be interpreted
-%# as mardown code
-</div>
-</div>