origen_memory_image 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d364a5cedbccf382fae2a6bf7732604387fbdaf1
-  data.tar.gz: 87baaf7587ea2ee10562844104638ccc1bc46252
+  metadata.gz: dbd9fff5f4d4a999086de046e0c99a016a475f15
+  data.tar.gz: a06173b18adeab5d1ce72f919cfa6b239bc04712
 SHA512:
-  metadata.gz: d6873cb75247b6fbc0924706c982f6b0d7edf980b8137d791e48c7a3344336254f85b5e352a6ced1170c9b3a112614cc47a0375d6d9dcfdf0e3496cba3a7d218
-  data.tar.gz: c4afd730adea6589dce1bb53cf243283c39a66b6257681db1888c4e84274abdd3704453b74de010b647ba97b9acec4ef31d12d26041e9b1f10c952f606bbc1c8
+  metadata.gz: 549bd0444aa5942e410d5ceece65c21bed5d4561932e1632e9ca605838f8599eafeb4dd50cf6b24616564645b90b3eaf67550e6a6ea86d07fb2f2b6be38f7298
+  data.tar.gz: cb109a9dc9fa36c486e8026ea5804ce7dd721882ecb2da6e76e63e915c6a07fcb6abd3ef3973632d1a8b766a4050ef0e94702135f669c5e7226bda6c1ce4b308

data/config/commands.rb

@@ -1,14 +1,12 @@
 # This file should be used to extend the origen command line tool with tasks 
 # specific to your application.
-# The comments below should help to get started and you can also refer to
-# lib/origen/commands.rb in your Origen core workspace for more examples and 
-# inspiration.
 #
 # Also see the official docs on adding commands:
-#   http://origen.freescale.net/origen/latest/guides/custom/commands/
+#   http://origen-sdk.org/origen/guides/custom/commands/
 
 # Map any command aliases here, for example to allow origen -x to refer to a 
 # command called execute you would add a reference as shown below: 
+
 aliases ={
 #  "-x" => "execute",
 }
@@ -17,76 +15,37 @@ aliases ={
 # the above alias table and should not be removed.
 @command = aliases[@command] || @command
 
-# Smome helper methods to enable test coverage, these will eventually be
-# added to Origen Core, but they need to be here for now
-def path_to_coverage_report
-  require 'pathname'
-  Pathname.new("#{Origen.root}/coverage/index.html").relative_path_from(Pathname.pwd)
-end
-
-def enable_coverage(name, merge=true)
-  if ARGV.delete("-c") || ARGV.delete("--coverage")
-    require 'simplecov'
-    SimpleCov.start do
-      command_name name
-      add_filter "DO_NOT_HAND_MODIFY"  # Exclude all imports
-
-      at_exit do
-        SimpleCov.result.format!
-        puts ""
-        puts "To view coverage report:"
-        puts "  firefox #{path_to_coverage_report} &"
-        puts ""
-      end
-    end
-    yield
-  else
-    yield
-  end
-end
-
 # Now branch to the specific task code
 case @command
 
 # Run the unit tests  
 when "specs"
-  enable_coverage("specs") do 
-    ARGV.unshift "spec"
-    require "rspec"
-    # For some unidentified reason Rspec does not autorun on this version
-    if RSpec::Core::Version::STRING && RSpec::Core::Version::STRING == "2.11.1"
-      RSpec::Core::Runner.run ARGV
-    else
-      require "rspec/autorun"
-    end
-  end
-  exit 0 # This will never be hit on a fail, RSpec will automatically exit 1
+  require "rspec"
+  exit RSpec::Core::Runner.run(['spec'])
 
 # Run the example-based (diff) tests
 #when "examples"  
 #  Origen.load_application
 #  status = 0
-#  enable_coverage("examples") do 
 #
-#    # Compiler tests
-#    ARGV = %w(templates/example.txt.erb -t debug -r approved)
-#    load "origen/commands/compile.rb"
-#    # Pattern generator tests
-#    #ARGV = %w(some_pattern -t debug -r approved)
-#    #load "#{Origen.top}/lib/origen/commands/generate.rb"
+#  # Compiler tests
+#  ARGV = %w(templates/example.txt.erb -t debug -r approved)
+#  load "origen/commands/compile.rb"
+#  # Pattern generator tests
+#  #ARGV = %w(some_pattern -t debug -r approved)
+#  #load "#{Origen.top}/lib/origen/commands/generate.rb"
 #
-#    if Origen.app.stats.changed_files == 0 &&
-#       Origen.app.stats.new_files == 0 &&
-#       Origen.app.stats.changed_patterns == 0 &&
-#       Origen.app.stats.new_patterns == 0
+#  if Origen.app.stats.changed_files == 0 &&
+#     Origen.app.stats.new_files == 0 &&
+#     Origen.app.stats.changed_patterns == 0 &&
+#     Origen.app.stats.new_patterns == 0
 #
-#      Origen.app.stats.report_pass
-#    else
-#      Origen.app.stats.report_fail
-#      status = 1
-#    end
-#    puts ""
+#    Origen.app.stats.report_pass
+#  else
+#    Origen.app.stats.report_fail
+#    status = 1
 #  end
+#  puts
 #  exit status  # Exit with a 1 on the event of a failure per std unix result codes
 
 # Always leave an else clause to allow control to fall back through to the
@@ -100,8 +59,4 @@ else
   EOT
 # examples     Run the examples (tests), -c will enable coverage
 
-  # Uncomment the following and update the path with the file
-  # that handles the commands that are shared from this plugin
-  #require "#{Origen.app_root}/config/shared_commands"
-
 end 

data/config/version.rb

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

data/lib/origen_memory_image/base.rb

@@ -28,9 +28,26 @@ module OrigenMemoryImage
     def to_a(options = {})
       options = {
         flip_endianness:     false,
-        data_width_in_bytes: 4
+        data_width_in_bytes: 4,
+        crop:                []
       }.merge(options)
       data = extract_addr_data(options)
+
+      if options[:crop].count > 0
+        cropped_data = []
+        data.each do |addr, data|
+          case options[:crop].count
+            when 1
+              cropped_data.push([addr, data]) if addr >= options[:crop][0]
+            when 2
+              cropped_data.push([addr, data]) if addr >= options[:crop][0] && addr <= options[:crop][1]
+            else
+              fail 'crop option can only be array of size 1 or 2'
+          end
+        end
+        data = cropped_data
+      end
+
       if options[:flip_endianness] || options[:endianness_change]
         data.map do |v|
           [v[0], flip_endianness(v[1], 4)]

data/templates/web/index.md.erb

@@ -79,14 +79,20 @@ my_srec.start_address   # => 0x3000_F000
 ~~~
 
 The <code>to_a</code> method returns the file content as an array of address/data pairs,
-this method supports options to set the data width and to flip the data endianness:
+this method supports options to set the data width, flip the data endianness, and crop the data
+between starting and ending address:
 
 ~~~ruby
-my_srec.to_a                          # => [[0x3000_F000, 0x11223344], [0x3000_F004, 0x55667788], ...]
+my_srec.to_a                                      # => [[0x3000_F000, 0x11223344], [0x3000_F004, 0x55667788], [0x3000_F008, 0x99AABBCC], ...]
 
-my_srec.to_a(flip_endianness: true)   # => [[0x3000_F000, 0x44332211], [0x3000_F004, 0x88776655], ...]
+my_srec.to_a(flip_endianness: true)               # => [[0x3000_F000, 0x44332211], [0x3000_F004, 0x88776655], [0x3000_F008, 0x99AABBCC], ...]
+
+my_srec.to_a(data_width_in_bytes: 2)              # => [[0x3000_F000, 0x1122], [0x3000_F002, 0x3344], [0x3000_F004, 0x5566], ...]
+
+my_srec.to_a(crop: [0x3000_F004])                 # => [[0x3000_F004, 0x55667788], [0x3000_F008, 0x99AABBCC], ...]
+
+my_srec.to_a(crop: [0x3000_F000, 0x3000_F004])    # => [[0x3000_F000, 0x11223344], [0x3000_F004, 0x55667788]]
 
-my_srec.to_a(data_width_in_bytes: 2)  # => [[0x3000_F000, 0x1122], [0x3000_F002, 0x3344], [0x3000_F004, 0x5566], ...]
 ~~~
 
 Such an array can be iterated on like this to separate the address and data:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_memory_image
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen