ipxact-ruby 0.13.2 → 0.14.0

data/Rakefile

@@ -1,4 +1,4 @@
-# Copyright (C) 2010 TIMA Laboratory
+# Copyright (C) 2010, 2011 TIMA Laboratory
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,8 +22,20 @@ begin
     gemspec.email = "guillaume.godetbar@gmail.com "
     gemspec.homepage = "http://tima-sls.imag.fr/www/research/ipxact/"
     gemspec.authors = ["Guillaume Godet-Bar"]
-    gemspec.files = FileList["{spec,schemas,autotest}/**/*", "lib/ipxact.rb", "lib/ipxact/*", "lib/ipxact/parser/*", "lib/ipxact/pathfinder/graph_pathfinder.rb", ".autotest", ".gitignore", "Rakefile", "VERSION"]
+    gemspec.files = FileList["{schemas,autotest}/**/*", "lib/ipxact.rb", "lib/ipxact/*", "lib/ipxact/parser/*", "lib/ipxact/pathfinder/graph_pathfinder.rb", ".autotest", ".gitignore", "Rakefile", "VERSION"]
+    gemspec.test_files = FileList["spec/**/*"]
     gemspec.add_dependency 'nokogiri'
+    gemspec.post_install_message = <<-POST_INSTALL_MESSAGE
+
+                                ("-._UPGRADING_.-")
+
+Thank you for installing IP-Xact Ruby - #{File.read("VERSION").strip}.
+Please make sure you have a look at http://tima-sls.imag.fr/www/research/ipxact/upgrading/
+for upgrade info!
+
+                                
+POST_INSTALL_MESSAGE
+
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.13.2
+0.14.0

data/lib/ipxact.rb

@@ -191,5 +191,4 @@ require File.join File.dirname(__FILE__), 'ipxact/parser'
 require File.join File.dirname(__FILE__), 'ipxact/platform'
 require File.join File.dirname(__FILE__), 'ipxact/register'
 require File.join File.dirname(__FILE__), 'ipxact/identifier'
-require File.join File.dirname(__FILE__), 'ipxact/pathfinder/graph_pathfinder'
 

data/lib/ipxact/component.rb

@@ -72,93 +72,6 @@ class IPXACT::Component
     !(self.cpus.nil? || self.cpus.empty?)
   end
 
-  # Calculates an optimal path in the subcomponent graph between
-  # +subcomponent_start+ and +subcomponent_end+. This computation takes into
-  # account hierarchical subcomponents, and identifies optimal sub-paths in
-  # these elements as well, using hierconnections. This method is in fact the
-  # facade for the {IPXACT::GraphPathFinder} class. It handles the creation of
-  # the connection Hash, and translates the result in a IPXACT-specific format.
-  #
-  # @param [String] subcomponent_start The name of the component instance that
-  #                 should be the source of the data path.
-  # @param [String] subcomponent_end The name of the component instance that
-  #                 should be the target of the data path.
-  #
-  # @return [Array<Array<Hash>>] an Array of Arrays of Hashes that summarizes
-  #   the component instances and the ports on the data path. Note that this
-  #   data path may be used for calculating the target component's base
-  #   address. The Arrays of Hashes are composed of 2 elements, the first
-  #   element being the source of a connection step and the second element
-  #   being the target of the connection step. Each element is a Hash, built as
-  #   follows:
-  #   +:component_instance+ the String name of the component instance that is
-  #   traversed by the data path;
-  #   +:port_name+ the String name of the port of the component instance that
-  #   is being traversed.
-  # @raise several exceptions. Please refer to {IPXACT::GraphPathFinder} class
-  #   for more details.
-  #
-  def resolve_data_path(subcomponent_start, subcomponent_end)
-    nodes, connections = rec_prepare_pathfinder_connections([], [])
-
-    pathfinder_connections = connections.collect do |connection|
-      {
-        :link => [nodes.index(connection[0][:component_instance]),
-                  nodes.index(connection[1][:component_instance])],
-        :ports => [connection[0][:port_name], connection[1][:port_name]]
-      }
-    end
-
-    pathfinder_interconnect = {:nodes => nodes, :connections => pathfinder_connections}
-    pathfinder = IPXACT::GraphPathFinder.new(pathfinder_interconnect)
-    finder_result = pathfinder.resolve(subcomponent_start, subcomponent_end)
-
-    formatted_result = finder_result.collect do |res|
-      pathfinder_interconnect[:connections][res]
-    end.collect do |connection|
-      [
-        {
-          :component_instance => pathfinder_interconnect[:nodes][connection[:link][0]],
-          :port_name => connection[:ports][0]
-        },
-        {
-          :component_instance => pathfinder_interconnect[:nodes][connection[:link][1]],
-          :port_name => connection[:ports][1]
-        }
-      ]
-    end
-  end
-
-  # Computes a the base address of the last component instance mentionned in
-  # the +data_path+. The latter should be calculated using the
-  # {#resolve_data_path} method. Additionally, this method takes into account
-  # all subcomponents from the +data_path+, and basically adds up mirrored slave
-  # ports' remap addresses.
-  #
-  # @param [Arrray] data_path the data path from which the base address should be
-  #                 calculated. Please refer to the documentation of
-  #                 {#resolve_data_path} for more details on the structure of
-  #                 this argument.
-  # @param [Integer] initial_value the value that should be added to the base
-  #                 address computed by the method.
-  #
-  # Returns the base address of the target component, as an Integer.
-  #
-  def resolve_base_address(data_path, initial_value = 0)
-    base_address = initial_value
-    data_path.each do |connection|
-      connection.each do |connection_step|
-        subcomponent = rec_get_subcomponent(connection_step[:component_instance])
-        port = subcomponent.ports \
-                  .select{|port| port[:name] == connection_step[:port_name]} \
-                  .first
-        if port[:type] == :mirrored_slave && !port[:port_data].nil?
-          base_address += port[:port_data][:remap][:address].to_i(16)
-        end
-      end
-    end
-    base_address
-  end
 
   # Get the component's register map, if any.
   #
@@ -227,50 +140,5 @@ class IPXACT::Component
     current_list
   end
 
-  # Prepares the connection structure for the {IPXACT::GraphPathFinder} class.
-  # Traverses the hierarchy of subcomponents in order to create a flattened
-  # representation of the subcomponents graph. In particular, the method
-  # considers hierconnections, and replaces the wrapper's interface port with
-  # the subcomponent's port that it is attached to.
-  #
-  # @return [Array<Array,Array<Hash>>] an Array of 2 elements, composed of a
-  #   list of nodes and a list of connections. Please refer to the
-  #   {IPXACT::GraphPathFinder#initialize} method for more details on
-  #   the structure of these elements (both Hashes).
-  #
-  def rec_prepare_pathfinder_connections(current_nodes, current_interconnections)
-    if subcomponents.empty?
-      [current_nodes << self.instance_name, current_interconnections]
-    else
-      subcomponents.each do |sub_name, subcomponent|
-        formatted_interconnections = interconnections.values.collect do |interconnect|
-          [reformat_connector(interconnect[0]), reformat_connector(interconnect[1])]
-        end
-        current_nodes, current_interconnections = \
-          subcomponent.rec_prepare_pathfinder_connections(current_nodes, current_interconnections + formatted_interconnections)
-      end
-      [current_nodes, current_interconnections]
-    end
-  end
-
-  # Executes the actual replacement of an hierarchical component's outside port
-  # with the attached subcomponent port.
-  #
-  # @return [Hash] the flattened connector, i.e., a Hash built as follows:
-  #   +:component_instance+ the String name of the component instance that is
-  #   traversed by the data path;
-  #   +:port_name+ the String name of the port of the component
-  #   instance that is being traversed.
-  #
-  def reformat_connector(connector)
-    instance = subcomponents[connector[:component_instance]]
-    if instance.subcomponents.empty?
-      new_connector = connector
-    else
-      port = connector[:port_name]
-      new_connector = instance.hierconnections[port]
-    end
-    new_connector
-  end
 
 end

data/spec/integration/data_calculation_spec.rb

@@ -17,60 +17,6 @@
 require File.join File.dirname(__FILE__), 'general_spec'
 
 describe "The data calculation functions of our IPXACT tool" do
-  it "should be able to find valid data paths when building a driver" do
-    expected_data_path = [
-      [
-        {
-          :component_instance => 'i_proc',
-          :port_name => "AHB_Master",
-        },
-        {
-          :component_instance => 'i_ahb',
-          :port_name => 'AHB_MirroredMaster0'
-        }
-      ],
-      [
-        {
-          :component_instance => 'i_ahb',
-          :port_name => 'AHB_MirroredSlave1'
-        },
-        {
-          :component_instance => 'i_h2p',
-          :port_name => 'AHB_Slave'
-        }
-      ],
-      [
-        {
-          :component_instance => 'i_h2p',
-          :port_name => 'APB_Master'
-        },
-        {
-          :component_instance => 'i_apb',
-          :port_name => 'APB_MirroredMaster'
-        }
-      ],
-      [
-        {
-          :component_instance => 'i_apb',
-          :port_name => 'APB_MirroredSlave7'
-        },
-        {
-          :component_instance => 'i_dma',
-          :port_name => 'APB_Slave'
-        }
-      ]
-    ]
-
-    components = IPXACT::load_components(PLATFORM_PATH)
-    designs = IPXACT::load_designs(PLATFORM_PATH)
-    platform = IPXACT::Parser::PlatformData.parse_platform(["Leon2Platform", "1.1"], components, designs)
-
-    data_path = nil
-    lambda {
-      data_path = platform.resolve_data_path('i_proc', 'i_dma')
-    }.should_not raise_exception
-    data_path.should eql(expected_data_path)
-  end
 
   it "should be able to assign instance variables to mirrored slave addresses and ranges" do
     expected_values = {
@@ -108,43 +54,4 @@ describe "The data calculation functions of our IPXACT tool" do
     end
   end
 
-  it "should be able to determine the dma component's base address from the interconnect path" do
-    # DMA remap address : 0x30000000 + 0x7000 = 0x30007000
-    components = IPXACT::load_components(PLATFORM_PATH)
-    designs = IPXACT::load_designs(PLATFORM_PATH)
-    platform = IPXACT::Parser::PlatformData.parse_platform(["Leon2Platform", "1.1"], components, designs)
-    data_path = platform.resolve_data_path('i_proc', 'i_dma')
-
-    base_address = platform.resolve_base_address(data_path)
-    base_address.should == 0x30007000 # AHB remap + APB remap (as defined in the apbSubsystem design file)
-  end
-
-
-  it "should be able to determine the cgu component's base address from the interconnect path" do
-    components = IPXACT::load_components(PLATFORM_PATH)
-    designs = IPXACT::load_designs(PLATFORM_PATH)
-    platform = IPXACT::Parser::PlatformData.parse_platform(["Leon2Platform", "1.2"], components, designs)
-    data_path = platform.resolve_data_path('i_proc', 'i_cgu')
-
-    base_address = platform.resolve_base_address(data_path)
-    base_address.should == 0x30004000
-  end
-
-  it "should be able to take into account the component registers' corresponding address block's base address" do
-    components = IPXACT::load_components(PLATFORM_PATH)
-    designs = IPXACT::load_designs(PLATFORM_PATH)
-    platform = IPXACT::Parser::PlatformData.parse_platform(["Leon2Platform", "1.2"], components, designs)
-    data_path = platform.resolve_data_path('i_proc', 'i_uart_scml')
-
-    base_address = platform.resolve_base_address(data_path)
-    port_id = data_path.last[1]
-    component = platform.rec_get_subcomponent('i_uart_scml')
-    port = component.port(port_id[:port_name])
-
-    # N.B. There's a remap address error in the "IP-XACT_TLM_Examples_AppNote_V1.5" document that's 
-    # released with the IP-XACT specification: remap address for the i_uart_scml instance does not match
-    # what is actually in the Leon2Platform file.
-    (base_address + port[:port_data][:base_address].to_i(16)).should == 0x30000000 + 0x2000 + 0xB0000000
-  end
-
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 13
-  - 2
-  version: 0.13.2
+  - 14
+  - 0
+  version: 0.14.0
 platform: ruby
 authors: 
 - Guillaume Godet-Bar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 +01:00
+date: 2011-03-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,6 @@ files:
 - lib/ipxact/parser/component_data_parser.rb
 - lib/ipxact/parser/identifier_parser.rb
 - lib/ipxact/parser/platform_data_parser.rb
-- lib/ipxact/pathfinder/graph_pathfinder.rb
 - lib/ipxact/platform.rb
 - lib/ipxact/register.rb
 - schemas/abstractionDefinition.xsd
@@ -78,6 +77,8 @@ files:
 - schemas/signalDrivers.xsd
 - schemas/simpleTypes.xsd
 - schemas/subInstances.xsd
+- README.html
+- README.mdown
 - spec/integration/bus_data_extraction_spec.rb
 - spec/integration/data_calculation_spec.rb
 - spec/integration/data_construction_spec.rb
@@ -178,18 +179,18 @@ files:
 - spec/test_data/spiritconsortium.org/Leon2TLM/uart_tac/1.0/tlmsrc/src/user_specific_Leon2_uart.cc
 - spec/test_data/spiritconsortium.org/Leon2TLM/uart_tac/1.0/uart_tac.xml
 - spec/unit/component_spec.rb
-- spec/unit/graph_pathfinder_spec.rb
 - spec/unit/identifier_spec.rb
 - spec/unit/interconnect_spec.rb
 - spec/unit/ipxact_spec.rb
 - spec/unit/platform_spec.rb
-- README.html
-- README.mdown
 has_rdoc: true
 homepage: http://tima-sls.imag.fr/www/research/ipxact/
 licenses: []
 
-post_install_message: 
+post_install_message: "\n                                (\"-._UPGRADING_.-\")\n\n\
+  Thank you for installing IP-Xact Ruby - 0.14.0.\n\
+  Please make sure you have a look at http://tima-sls.imag.fr/www/research/ipxact/upgrading/\n\
+  for upgrade info!\n\n                                \n"
 rdoc_options: []
 
 require_paths: 
@@ -222,8 +223,102 @@ test_files:
 - spec/integration/data_calculation_spec.rb
 - spec/integration/data_construction_spec.rb
 - spec/integration/general_spec.rb
+- spec/test_data/spiritconsortium.org/Leon2TLM/PV/pv_initiator_port.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/PV/pv_initiator_port.tpp
+- spec/test_data/spiritconsortium.org/Leon2TLM/PV/pv_initiator_port_base.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/PV/pv_router.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/PV/pv_router.tpp
+- spec/test_data/spiritconsortium.org/Leon2TLM/PV/pv_slave_base.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/PV/pv_slave_base.tpp
+- spec/test_data/spiritconsortium.org/Leon2TLM/PV/pv_target_port.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/PV/pv_target_port_base.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/PV/pv_tlm_if.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/PV/user_types.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM1/Leon2Platform/Leon2Platform.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM1/Leon2Platform/design_Leon2Platform.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM1/Leon2Platform/tlmsrc/Leon2Platform.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM1/apbSubSystem/apbSubSystem.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM1/apbSubSystem/design_apbSubSystem.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM1/apbSubSystem/tlmsrc/apbSubSystem.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM2/Leon2Platform/Leon2Platform.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM2/Leon2Platform/design_Leon2Platform.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM2/Leon2Platform/tlmsrc/Leon2Platform.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM2/apbSubSystem/apbSubSystem.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM2/apbSubSystem/designConfig_apbSubSystem.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM2/apbSubSystem/design_apbSubSystem.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM2/apbSubSystem/tlmsrc/apbSubSystem.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM3/Leon2Platform/Leon2Platform.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM3/Leon2Platform/design_Leon2Platform.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM3/Leon2Platform/tlmsrc/Leon2Platform.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM3/apbSubSystem/apbSubSystem.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM3/apbSubSystem/designConfig_apbSubSystem.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM3/apbSubSystem/design_apbSubSystem.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/SystemTLM3/apbSubSystem/tlmsrc/apbSubSystem.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/ahbbus/1.4/ahbbus22.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/ahbbus/1.4/tlmsrc/ahbbus.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/ahbram/1.4/ahbram.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/ahbram/1.4/tlmsrc/ahbram.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/ahbram/1.4/tlmsrc/ahbram.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/apbbus/1.4/apbbus8.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/apbbus/1.4/tlmsrc/apbbus.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/apbmst/1.4/apbmst.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/apbmst/1.4/tlmsrc/apbmst.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/apbram/1.0/apbram.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/apbram/1.0/hdlsrc/apbram.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/apbram/1.0/hdlsrc/apbram.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/apbram/1.0/hdlsrc/apbram.v
+- spec/test_data/spiritconsortium.org/Leon2TLM/apbram/1.0/hdlsrc/apbram.vhd
+- spec/test_data/spiritconsortium.org/Leon2TLM/cgu/1.4/cgu.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/cgu/1.4/tlmsrc/cgu.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/cgu/1.4/tlmsrc/cgu.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/cgu/1.5/cgu.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/cgu/1.5/tlmsrc/cgu.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/cgu/1.5/tlmsrc/cgu.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/dma/1.4/dma.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/dma/1.4/tlmsrc/dma.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/dma/1.4/tlmsrc/dma.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/irqctrl/1.4/irqctrl.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/irqctrl/1.4/tlmsrc/irqctrl.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/irqctrl/1.4/tlmsrc/irqctrl.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/processor/1.4/processor.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/processor/1.4/tlmsrc/processor.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/processor/1.4/tlmsrc/processor.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/pv2apb/1.0/pv2apb.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/pv2apb/1.0/tlmsrc/pv2apb.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/pv2apb/1.0/tlmsrc/pv2apb.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/pv2tac/1.0/pv2tac.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/pv2tac/1.0/tlmsrc/pv2tac.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/pv2tac/1.0/tlmsrc/pv2tac.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/rgu/1.4/rgu.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/rgu/1.4/tlmsrc/rgu.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/rgu/1.4/tlmsrc/rgu.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/scmlAdaptor/1.0/scmlAdaptor.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/scmlAdaptor/1.0/tlmsrc/scmladaptor.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/scmlAdaptor/1.0/tlmsrc/scmladaptor.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/serial_device/1.0/serial_device.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/serial_device/1.0/tlmsrc/serial_device.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/timers/1.4/timers.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/timers/1.4/tlmsrc/timers.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/timers/1.4/tlmsrc/timers.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_scml/1.0/tlmsrc/inc/uart.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_scml/1.0/tlmsrc/inc/uart_fifo.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_scml/1.0/tlmsrc/inc/uart_memory_map.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_scml/1.0/tlmsrc/inc/uart_types.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_scml/1.0/tlmsrc/src/uart.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_scml/1.0/tlmsrc/src/uart_interrupt_handler.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_scml/1.0/tlmsrc/src/uart_register_bank.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_scml/1.0/tlmsrc/src/uart_serial_tx_rx.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_scml/1.0/uart_scml.xml
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_tac/1.0/tlmsrc/include/Leon2_uart.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_tac/1.0/tlmsrc/include/def_Leon2_uart.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_tac/1.0/tlmsrc/include/tlm_field.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_tac/1.0/tlmsrc/include/tlm_register.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_tac/1.0/tlmsrc/include/tlmreg_Leon2_uart.h
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_tac/1.0/tlmsrc/src/Leon2_uart.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_tac/1.0/tlmsrc/src/tlmreg_Leon2_uart.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_tac/1.0/tlmsrc/src/user_specific_Leon2_uart.cc
+- spec/test_data/spiritconsortium.org/Leon2TLM/uart_tac/1.0/uart_tac.xml
 - spec/unit/component_spec.rb
-- spec/unit/graph_pathfinder_spec.rb
 - spec/unit/identifier_spec.rb
 - spec/unit/interconnect_spec.rb
 - spec/unit/ipxact_spec.rb

data/lib/ipxact/pathfinder/graph_pathfinder.rb

@@ -1,191 +0,0 @@
-# Copyright (C) 2010 TIMA Laboratory
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-# {IPXACT::GraphPathFinder} instances are used by {IPXACT::Component} instances
-# for handling Branch-And-Bound type data path searches within a given IPXACT
-# architecture. The {IPXACT::Component} is responsible for translating the IPXACT
-# architecture into a list of connections and transition weights, which may
-# then be queried for optimal paths between two nodes from the connection
-# graph. As such, even though the path finder is pretty generic, it should not
-# be used directly for IPXACT-related work.
-#
-# @example
-#   @pathfinder = IPXACT::GraphPathFinder.new({
-#     :nodes => ['component_a', 'component_b', 'component_c']
-#     :connections =>
-#       [
-#         {:link => [0,1]},
-#         {:link => [1,2], :cost => 2},
-#         {:link => [2,0]}
-#       ]
-#   })
-#   @data_path = @pathfinder.resolve('component_a', 'component_b')
-#
-# @author Guillaume Godet-Bar
-#
-class IPXACT::GraphPathFinder
-
-  # The initializer is essentially used for passing a structured connection
-  # Hash.
-  #
-  # @param [Hash] hash the connection Hash, which should be structured as follows:
-  #
-  #         :nodes        - An Array of node names (String).
-  #
-  #         :connections  - An Array of connection elements, which are defined as
-  #                         :link - A 2-element Array, which describes an oriented
-  #                                 connection between two nodes. The nodes are
-  #                                 expressed using their index in the :nodes
-  #                                 Array.
-  #                         :cost - A positive Integer expressing the cost of
-  #                                 the transition (in the sense of a
-  #                                 Branch-And-Bound algorithm) (optional,
-  #                                 default: 1).
-  #
-  def initialize(hash)
-    @hash = hash
-  end
-
-  # Searches an optimal path between the start and _end elements, which
-  # should be defined in the Hash structured used for instanciating the
-  # {IPXACT::GraphPathFinder} instance. Optimal should be understood as "the
-  # cheapest path given the cost of each connection". Additionally, validates
-  # the latter Hash structure before executing the search algorithm.
-  #
-  # @param [String] start a String that corresponds to an element that was
-  #         registered when the pathfinder was created. The latter will be used
-  #         as the start node by the pathfinder algorithm.
-  # @param [String] _end a String that corresponds to an element that was
-  #         registered when the pathfinder was created. The latter will be used
-  #         as the target node by the pathfinder algorithm.
-  #
-  # @return [Array<Integer>] an Array of Integers corresponding to connection
-  #   indices for the optimal data path between the +start+ and +_end+
-  #   elements, or an empty Array if the +start+ and +_end+ elements are
-  #   identical.
-  # 
-  # @raise an exception if the Hash structure for the connections is empty.
-  # @raise an exception unless all the node names are unique.
-  # @raise an exception if the start or end element does not exist.
-  # @raise an exception if no optimal data path could be found.
-  #
-  def resolve(start, _end)
-    raise "Empty connection table!" if @hash.empty?
-    return [] if start == _end
-    raise "Duplicate connection node found!" if @hash[:nodes].uniq.size != @hash[:nodes].size
-    raise "The source or target node does not exist!" unless @hash[:nodes].include?(start) && @hash[:nodes].include?(_end)
-
-    @interconnect_table = (0..@hash[:nodes].size - 1).collect do |i|
-      (0..@hash[:nodes].size - 1).collect do |j|
-        result_hash = { 
-          :connection =>
-            @hash[:connections].any?{|connection| connection[:link] == [j,i]},
-          :total => Float::INFINITY,
-          :previous => nil
-        }
-        if @hash[:connections].any?{|connection| connection[:link] == [j,i]}
-          result = @hash[:connections].select{|connection| connection[:link] == [j,i]}.first[:cost] || 1
-          result_hash.merge!({:cost => result})
-        end
-
-        result_hash
-      end
-    end
-
-    start_index = @hash[:nodes].index(start)
-    end_index = @hash[:nodes].index(_end)
-    @interconnect_table[start_index][start_index][:total] = 0
-
-
-    rec_resolve([start_index, start_index], end_index, 0)
-
-    last_writer_index = nil
-    @interconnect_table[end_index].each_with_index do |el, i|
-      last_writer_index = i if el[:total] < Float::INFINITY
-    end
-    raise "Destination could not be reached!" if last_writer_index.nil?
-    
-    
-    dump_trajectory(end_index).reverse
-
-  end
-
-private
-
-  # Recursive function for the pathfinder search algorithm.
-  # 
-  # @param [Array] current the current node that is being traversed by the 
-  #                algorithm.
-  # @param [Integer] _end the index of the target node.
-  # @param [Integer] current_total current Integer cost of the trajectory that
-  # is being explored by this branch of the algorithm.
-  # 
-  def rec_resolve(current, _end, current_total)
-    current_writer_index = current[0]
-    (0..@interconnect_table.size - 1).each do |i|
-      if @interconnect_table[i][current_writer_index][:connection]
-        new_total = current_total + (@interconnect_table[i][current_writer_index][:cost] || 1)
-
-        if @interconnect_table[i][current_writer_index][:total] > new_total
-          @interconnect_table[i][current_writer_index] = {:total => new_total, :connection => true, :previous => current.reverse}
-
-          unless @interconnect_table[_end].any?{|el| el[:total] < new_total}
-            rec_resolve([i, current_writer_index], _end, new_total)
-          end
-        end
-      end
-    end
-  end
-
-  # Scans the interconnect table, starting with the end_index, and traces a
-  # trajectory back to its source, using the traceback references in each cell
-  # from the interconnect table. The source cell is considered as the cell for
-  # which there is no traceback reference.
-  #
-  # @param [Integer] end_index an Integer that corresponds to the last
-  #             element (from the original Hash structure) for which there
-  #             should be a trajectory calculated by the search algorithm.
-  #
-  # @return [Array<Integer>] the connection indices from the original Hash
-  #   structure.
-  #
-  def dump_trajectory(end_index)
-    result = []
-    
-    # Get the path with the cheapest result
-    min_element = @interconnect_table[end_index].min{|a,b| a[:total] <=> b[:total]}
-    min_index = @interconnect_table[end_index].index(min_element)
-
-    previous = [min_index, end_index]
-    begin
-      connection_index = @hash[:connections].index(@hash[:connections].detect{|el| el[:link] == previous})
-      result << connection_index unless connection_index.nil?
-      previous = @interconnect_table[previous[1]][previous[0]][:previous]
-    end while not previous.nil?
-
-    result
-  end
-
-  # Commodity method for printing the interconnect table during the execution of the search algorigthm.
-  #
-  def dump_table
-    @interconnect_table.inject('') do |row_acc, row|
-      row_acc + "\n" + row.inject('') do |col_acc, col|
-        col_acc + (col[:total] == Float::INFINITY ? 'I' : col[:total].to_s) + " | "
-      end
-    end
-  end
-end

data/spec/unit/graph_pathfinder_spec.rb

@@ -1,128 +0,0 @@
-# Copyright (C) 2010 TIMA Laboratory
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-require File.join File.dirname(__FILE__), '../../lib/ipxact'
-
-
-describe IPXACT::GraphPathFinder do
-
-  before(:each) do
-      @simple_graph = {
-        :nodes => ['component_a', 'component_b', 'component_c',
-                   'component_d'],
-        :connections =>
-          [
-            {:link => [0,1], :via => 'connect_1'},
-            {:link => [1,2], :via => 'connect_2'},
-            {:link => [2,0], :via => 'connect_3.1'},
-            {:link => [2,3], :via => 'connect_3.2'}
-          ]
-      }
-
-      @complete_graph = {
-        :nodes => ['i_proc', 'i_ahb', 'i_dma', 'i_sub', 'i_mem',
-                   'i_cgu', 'i_rgu'],
-        :connections =>
-          [
-            {:link => [0,1], :via => 'connect_1'},
-            {:link => [2,1], :via => 'connect_2'},
-            {:link => [1,4], :via => 'connect_3'},
-            {:link => [1,3], :via => 'connect_4'},
-            {:link => [3,0], :via => 'connect_5'},
-            {:link => [3,5], :via => 'connect_6'},
-            {:link => [3,6], :via => 'connect_7'},
-            {:link => [3,2], :via => 'connect_8'}
-          ]
-      }
-
-      @cheapest_path_graph = {
-        :nodes => ['component_a', 'component_b', 'component_c',
-                   'component_d'],
-        :connections =>
-          [
-            {:link => [0,1], :via => 'connect_1'},
-            {:link => [1,2], :cost => 8, :via => 'connect_expensive'},
-            {:link => [2,3], :via => 'connect_2'},
-            {:link => [1,3], :cost => 9, :via => 'connect_cheaper'}
-          ]
-      }
-  end
-
-  context "incorrect graph/arguments" do
-    it "should return an exception when the graph is empty" do
-      finder = IPXACT::GraphPathFinder.new({})
-      lambda {
-        finder.resolve('component_a', 'component_b')
-      }.should raise_exception
-    end
-
-    it "should return an exception if any component is not unique" do
-      @simple_graph[:nodes][1] = 'component_a'
-      finder = IPXACT::GraphPathFinder.new @simple_graph
-      lambda {
-        finder.resolve('component_a', 'component_c')
-      }.should raise_exception
-    end
-
-    it "should return an exception if the source or target component does not exist" do
-      finder = IPXACT::GraphPathFinder.new @simple_graph
-      lambda {
-        finder.resolve('component_a', 'component_z')
-      }.should raise_exception
-      lambda {
-        finder.resolve('component_z', 'component_a')
-      }.should raise_exception
-    end
-
-  end
-
-  context "graph pathfinding" do
-    it "should return an empty array if the source equals the destination" do
-      finder = IPXACT::GraphPathFinder.new @simple_graph
-      finder.resolve('component_a', 'component_a').should eql([])
-    end
-
-    it "should return an array with a single element if the source is right next to the destination" do
-      finder = IPXACT::GraphPathFinder.new(@simple_graph)
-      finder.resolve('component_a', 'component_b').should eql([0])
-      finder.resolve('component_c', 'component_a').should eql([2])
-    end
-
-    it "should raise an exception if the destination cannot be reached" do
-      finder = IPXACT::GraphPathFinder.new(@simple_graph)
-      lambda {
-        finder.resolve('component_d', 'component_a')
-      }.should raise_exception
-    end
-
-    it "should return a correct path from a simple graph" do
-      finder = IPXACT::GraphPathFinder.new(@simple_graph)
-      finder.resolve('component_a', 'component_d').should eql([0,1,3])
-    end
-
-    it "should be able to favor a cheaper path" do
-      finder = IPXACT::GraphPathFinder.new(@cheapest_path_graph)
-      finder.resolve('component_a', 'component_d').should eql([0,3])
-    end
-
-    it "should return a correct path from a realistic connection graph" do
-      finder = IPXACT::GraphPathFinder.new(@complete_graph)
-      finder.resolve('i_proc', 'i_dma').should eql([0,3,7])
-      finder.resolve('i_dma', 'i_proc').should eql([1,3,4])
-    end
-
-  end
-end