origen_memory_image 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbd9fff5f4d4a999086de046e0c99a016a475f15
-  data.tar.gz: a06173b18adeab5d1ce72f919cfa6b239bc04712
+  metadata.gz: caf8c439a35b5f220e8274b6626673ee7525271a
+  data.tar.gz: ec7fbf5149451f4ec2f92f4f9e9cbb4757ffd897
 SHA512:
-  metadata.gz: 549bd0444aa5942e410d5ceece65c21bed5d4561932e1632e9ca605838f8599eafeb4dd50cf6b24616564645b90b3eaf67550e6a6ea86d07fb2f2b6be38f7298
-  data.tar.gz: cb109a9dc9fa36c486e8026ea5804ce7dd721882ecb2da6e76e63e915c6a07fcb6abd3ef3973632d1a8b766a4050ef0e94702135f669c5e7226bda6c1ce4b308
+  metadata.gz: 94959863f2afed01b3300650b793209631118c11fca988b89b30bdc162497974a53423c87c2538c84569448f98f1ed7ba77f198983c24b11e67f27fc5e0b929d
+  data.tar.gz: feb360c36844b949e4463956ab81d69e5e0dfee76b094fee1acf149ef946cb27b3f0c79ec77748dc6003be23bbe918d7bb35fa77665a7e40a7c0eb528a7f2553

data/config/boot.rb

@@ -0,0 +1 @@
+require "origen_memory_image"

data/config/version.rb

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

data/lib/origen_memory_image.rb

@@ -1,8 +1,12 @@
 require 'origen'
 require_relative '../config/application.rb'
-require_relative '../config/environment.rb'
 
 module OrigenMemoryImage
+  autoload :Base, 'origen_memory_image/base'
+  autoload :SRecord, 'origen_memory_image/s_record'
+  autoload :Hex, 'origen_memory_image/hex'
+  autoload :Binary, 'origen_memory_image/binary'
+
   def self.new(file, options = {})
     unless options[:source] == String
       file = Origen.file_handler.clean_path_to(file)
@@ -19,6 +23,12 @@ module OrigenMemoryImage
       snippet = File.foreach(file.to_s).first(1)
     end
     case
+    # Always do the binary first since the others won't be able to process
+    # a binary snippet
+    when options[:type] == :binary || (options[:source] != String && Binary.match?(file))
+      Binary
+    when options[:source] == String && Binary.match?(snippet, true)
+      Binary
     when options[:type] == :srecord || SRecord.match?(snippet)
       SRecord
     when options[:type] == :hex || Hex.match?(snippet)

data/lib/origen_memory_image/binary.rb

@@ -0,0 +1,69 @@
+require 'ptools'
+
+module OrigenMemoryImage
+  class Binary < Base
+    def self.match?(file, snippet = false)
+      if snippet
+        file.all? { |l| l.strip =~ /^[01]*$/ }
+      else
+        File.binary?(file)
+      end
+    end
+
+    # Always returns 0 since binary files do not contain addresses
+    def start_address
+      0
+    end
+
+    def create_test_file
+      data = [
+        0x1EE0021C, 0x22401BE0, 0x021C2243,
+        0x18E0021C, 0x5A780A43, 0x03E0034B,
+        0xF7215A78, 0x0A400020, 0x22E08442,
+        0x22D31FE0, 0x84421FD9, 0x1CE08442,
+        0x002B20D1, 0x03E0012A, 0x01D1002B,
+        0x1BD00223, 0x2340022A, 0x02D1002B,
+        0x15D103E0, 0x032A01D1, 0x78000018,
+        0x7C000018, 0x82000018, 0x88000018
+      ]
+      data = data.map { |d| d.to_s(2).rjust(32, '0') }.join
+      File.open('examples/bin1.bin', 'wb') do |output|
+        output.write [data].pack('B*')
+      end
+    end
+
+    private
+
+    # Returns an array containing all address/data from the given s-record
+    # No address manipulation is performed, that is left to the caller to apply
+    # any scrambling as required by the target system
+    def extract_addr_data(options = {})
+      options = {
+        data_width_in_bytes: 4
+      }.merge(options)
+
+      result = []
+      width = options[:data_width_in_bytes]
+      address = 0
+
+      if file
+        raw = File.binread(file)
+        bytes = raw.unpack('C*')
+      else
+        raw = lines.map(&:strip).join
+        bytes = raw.scan(/.{1,8}/).map { |s| s.to_i(2) }
+      end
+
+      bytes.each_slice(width) do |d|
+        v = 0
+        width.times do |i|
+          v |= d[i] << ((width - 1 - i) * 8) if d[i]
+        end
+        result << [address, v]
+        address += width
+      end
+
+      result
+    end
+  end
+end

data/templates/web/index.md.erb

@@ -135,6 +135,17 @@ The data lines can be grouped into any size:
 780000187C0000188200001888000018 
 ~~~
 
+#### Binary Files
+
+A binary file:
+
+~~~text
+00001101000101010000111100010011
+00001110000101000001000000010010
+00000000000000000000010000010111
+00000100000000110000010100000110
+~~~
+
 ### How To Setup a Development Environment
 
 [Clone the repository from Github](https://github.com/Origen-SDK/origen_memory_image).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_memory_image
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: ptools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: origen_doc_helpers
   requirement: !ruby/object:Gem::Requirement
@@ -46,13 +60,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - config/application.rb
+- config/boot.rb
 - config/commands.rb
-- config/development.rb
-- config/environment.rb
-- config/users.rb
 - config/version.rb
 - lib/origen_memory_image.rb
 - lib/origen_memory_image/base.rb
+- lib/origen_memory_image/binary.rb
 - lib/origen_memory_image/hex.rb
 - lib/origen_memory_image/s_record.rb
 - templates/web/index.md.erb
@@ -78,10 +91,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Provides a standard API for consuming memory image files in any format e.g.
   s-record, hex
 test_files: []
-has_rdoc: 

data/config/development.rb

@@ -1,12 +0,0 @@
-# This file is similar to environment.rb and will be loaded
-# automatically at the start of each invocation of Origen.
-#
-# However the major difference is that it will not be loaded
-# if the application is imported by a 3rd party app - in that
-# case only environment.rb is loaded.
-#
-# Therefore this file should be used to load anything you need
-# to setup a development environment for this app, normally
-# this would be used to load some dummy classes to instantiate
-# your objects so that they can be tested and/or interacted with
-# in the console.

data/config/environment.rb

@@ -1,40 +0,0 @@
-# This file will be required by Origen before your target is loaded, you 
-# can use this to require all of your files, which is the easiest way
-# to get started. As your experience grows you may wish to require only the
-# minimum files required to allow the target to be initialized and let 
-# each class require its own dependencies.
-#
-# It is recommended that you keep all of your application logic in lib/
-# The lib directory has already been added to the search path and so any files
-# in there can be referenced from here with a relative path.
-#
-# Note that pattern files do not need to be referenced from here and these
-# will be located automatically by origen.
-#
-# Examples
-# --------
-# This says load the file "lib/pioneer.rb" the first time anyone makes a 
-# reference to the class name 'Pioneer'.
-#autoload :Pioneer,   "pioneer"
-#
-# This is generally preferable to using require which will load the file
-# regardless of whether it is needed by the current target or not:
-#require "pioneer"
-#
-# Sometimes you have to use require however:-
-#   1. When defining a test program interface:
-#require "interfaces/j750"
-#   2. If you want to extend a class defined by an imported plugin, in
-#      this case your must use required and supply a full path (to distinguish
-#      it from the one in the parent application):
-#require "#{Origen.root}/c90_top_level/p2"
-
-# Plugins should not use a wildcard import of the lib directory to help
-# prevent long start up times, only require what is necessary to boot and
-# use autoload for everything else.
-module OrigenMemoryImage
-  autoload :Base, "origen_memory_image/base"
-  autoload :SRecord, "origen_memory_image/s_record"
-  autoload :Hex, "origen_memory_image/hex"
-end
-require "origen_memory_image"

data/config/users.rb

@@ -1,18 +0,0 @@
-# This file defines the users associated with your project, it is basically the 
-# mailing list for release notes.
-#
-# You can split your users into "admin" and "user" groups, the main difference 
-# between the two is that admin users will get all tag emails, users will get
-# emails on external/official releases only.
-#
-# Users are also prohibited from running the "origen tag" task, but this is 
-# really just to prevent a casual user from executing it inadvertently and is
-# not intended to be a serious security gate.
-module Origen
-  module Users
-    def users
-      @users ||= [
-      ]
-    end
-  end
-end