origen_memory_image 0.6.1 → 0.7.0

data/lib/origen_memory_image/binary.rb

@@ -1,69 +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
+module OrigenMemoryImage
+  class Binary < Base
+    def self.match?(file, snippet = false)
+      if snippet
+        file.all? { |l| l.strip =~ /^[01]*$/ }
+      else
+        # detect whether the data is mostly not alpha numeric
+        filedata = (File.read(file, 256) || '')
+        (filedata.gsub(/\s+/, '').gsub(/\w/, '').length.to_f / filedata.length.to_f) > 0.3
+      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/lib/origen_memory_image/hex.rb

@@ -1,56 +1,56 @@
-module OrigenMemoryImage
-  class Hex < Base
-    def self.match?(snippet)
-      snippet.any? do |line|
-        # Match a line like:
-        # @180000F0
-        line =~ /^@[0-9a-fA-F]+\s?$/
-      end
-    end
-
-    # The first in the file will be taken as the start address
-    def start_address
-      @start_address ||= begin
-        lines.each do |line|
-          if line =~ /^@([0-9a-fA-F]+)\s?$/
-            return Regexp.last_match[1].to_i(16)
-          end
-        end
-      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 = []
-      lines.each do |line|
-        # Only if the line is an s-record with data...
-        if line =~ /^@([0-9a-fA-F]+)\s?$/
-          @address = Regexp.last_match[1].to_i(16)
-        elsif line =~ /^[0-9A-F]/
-          unless @address
-            fail "Hex data found before an @address line in #{file_name}"
-          end
-          data = line.strip.gsub(/\s/, '')
-          data_matcher = '\w\w' * options[:data_width_in_bytes]
-          data.scan(/#{data_matcher}/).each do |data_packet|
-            result << [@address, data_packet.to_i(16)]
-            @address += options[:data_width_in_bytes]
-          end
-          # If a partial word is left over
-          if (remainder = data.length % (2 * options[:data_width_in_bytes])) > 0
-            result << [@address, data[data.length - remainder..data.length].to_i(16)]
-          end
-        end
-      end
-      result
-    end
-  end
-end
+module OrigenMemoryImage
+  class Hex < Base
+    def self.match?(snippet)
+      snippet.any? do |line|
+        # Match a line like:
+        # @180000F0
+        line =~ /^@[0-9a-fA-F]+\s?$/
+      end
+    end
+
+    # The first in the file will be taken as the start address
+    def start_address
+      @start_address ||= begin
+        lines.each do |line|
+          if line =~ /^@([0-9a-fA-F]+)\s?$/
+            return Regexp.last_match[1].to_i(16)
+          end
+        end
+      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 = []
+      lines.each do |line|
+        # Only if the line is an s-record with data...
+        if line =~ /^@([0-9a-fA-F]+)\s?$/
+          @address = Regexp.last_match[1].to_i(16)
+        elsif line =~ /^[0-9A-F]/
+          unless @address
+            fail "Hex data found before an @address line in #{file_name}"
+          end
+          data = line.strip.gsub(/\s/, '')
+          data_matcher = '\w\w' * options[:data_width_in_bytes]
+          data.scan(/#{data_matcher}/).each do |data_packet|
+            result << [@address, data_packet.to_i(16)]
+            @address += options[:data_width_in_bytes]
+          end
+          # If a partial word is left over
+          if (remainder = data.length % (2 * options[:data_width_in_bytes])) > 0
+            result << [@address, data[data.length - remainder..data.length].to_i(16)]
+          end
+        end
+      end
+      result
+    end
+  end
+end

data/lib/origen_memory_image/s_record.rb

@@ -1,212 +1,212 @@
-module OrigenMemoryImage
-  # An S-record file consists of a sequence of specially formatted ASCII character strings. An S-record will
-  # be less than or equal to 78 bytes in length.
-  # The order of S-records within a file is of no significance and no particular order may be assumed.
-  #
-  # The general format of an S-record follows:
-  #
-  #   +-------------------//------------------//-----------------------+
-  #   | type | count | address  |            data           | checksum |
-  #   +-------------------//------------------//-----------------------+
-  #
-  # type
-  # : A char[2] field. These characters describe the type of record (S0, S1, S2, S3, S5, S7, S8, or S9).
-  #
-  # count
-  # : A char[2] field. These characters when paired and interpreted as a hexadecimal value, display
-  # the count of remaining character pairs in the record.
-  #
-  # address
-  # : A char[4,6, or 8] field. These characters grouped and interpreted as a hexadecimal value,
-  # display the address at which the data field is to be loaded into memory. The length of the field depends
-  # on the number of bytes necessary to hold the address. A 2-byte address uses 4 characters, a 3-byte
-  # address uses 6 characters, and a 4-byte address uses 8 characters.
-  #
-  # data
-  # : A char [0-64] field. These characters when paired and interpreted as hexadecimal values represent
-  # the memory loadable data or descriptive information.
-  #
-  # checksum
-  # : A char[2] field. These characters when paired and interpreted as a hexadecimal value display
-  # the least significant byte of the ones complement of the sum of the byte values represented by the pairs
-  # of characters making up the count, the address, and the data fields.
-  #
-  # Each record is terminated with a line feed. If any additional or different record terminator(s) or delay
-  # characters are needed during transmission to the target system it is the responsibility of the
-  # transmitting program to provide them.
-  #
-  # #### S0 Record
-  #
-  # The type of record is 'S0' (0x5330). The address field is unused and will be filled with zeros
-  # (0x0000). The header information within the data field is divided into the following subfields.
-  #
-  # * mname is char[20] and is the module name.
-  # * ver is char[2] and is the version number.
-  # * rev is char[2] and is the revision number.
-  # * description is char[0-36] and is a text comment.
-  #
-  # Each of the subfields is composed of ASCII bytes whose associated characters, when paired, represent one
-  # byte hexadecimal values in the case of the version and revision numbers, or represent the hexadecimal
-  # values of the ASCII characters comprising the module name and description.
-  #
-  # #### S1 Record
-  #
-  # The type of record field is 'S1' (0x5331). The address field is intrepreted as a 2-byte
-  # address. The data field is composed of memory loadable data.
-  #
-  # #### S2 Record
-  #
-  # The type of record field is 'S2' (0x5332). The address field is intrepreted as a 3-byte
-  # address. The data field is composed of memory loadable data.
-  #
-  # #### S3 Record
-  #
-  # The type of record field is 'S3' (0x5333). The address field is intrepreted as a 4-byte
-  # address. The data field is composed of memory loadable data.
-  #
-  # #### S5 Record
-  #
-  # The type of record field is 'S5' (0x5335). The address field is intrepreted as a 2-byte value
-  # and contains the count of S1, S2, and S3 records previously transmitted. There is no data field.
-  #
-  # #### S7 Record
-  #
-  # The type of record field is 'S7' (0x5337). The address field contains the starting execution
-  # address and is intrepreted as 4-byte address. There is no data field.
-  #
-  # #### S8 Record
-  #
-  # The type of record field is 'S8' (0x5338). The address field contains the starting execution
-  # address and is intrepreted as 3-byte address. There is no data field.
-  #
-  # #### S9 Record
-  #
-  # The type of record field is 'S9' (0x5339). The address field contains the starting execution
-  # address and is intrepreted as 2-byte address. There is no data field.
-  #
-  # ### Example
-  #
-  # Shown below is a typical S-record format file.
-  #
-  #   S00600004844521B
-  #   S1130000285F245F2212226A000424290008237C2A
-  #   S11300100002000800082629001853812341001813
-  #   S113002041E900084E42234300182342000824A952
-  #   S107003000144ED492
-  #   S5030004F8
-  #   S9030000FC
-  #
-  # The file consists of one S0 record, four S1 records, one S5 record and an S9 record.
-  #
-  # The S0 record is comprised as follows:
-  #
-  # * S0 S-record type S0, indicating it is a header record.
-  # * 06 Hexadecimal 06 (decimal 6), indicating that six character pairs (or ASCII bytes) follow.
-  # * 00 00 Four character 2-byte address field, zeroes in this example.
-  # * 48 44 52 ASCII H, D, and R - "HDR".
-  # * 1B The checksum.
-  #
-  # The first S1 record is comprised as follows:
-  #
-  # * S1 S-record type S1, indicating it is a data record to be loaded at a 2-byte address.
-  # * 13 Hexadecimal 13 (decimal 19), indicating that nineteen character pairs, representing a 2 byte address,
-  # * 16 bytes of binary data, and a 1 byte checksum, follow.
-  # * 00 00 Four character 2-byte address field; hexidecimal address 0x0000, where the data which follows is to
-  #   be loaded.
-  # * 28 5F 24 5F 22 12 22 6A 00 04 24 29 00 08 23 7C Sixteen character pairs representing the actual binary
-  #   data.
-  # * 2A The checksum.
-  # * The second and third S1 records each contain 0x13 (19) character pairs and are ended with checksums of 13
-  #   and 52, respectively. The fourth S1 record contains 07 character pairs and has a checksum of 92.
-  #
-  # The S5 record is comprised as follows:
-  #
-  # * S5 S-record type S5, indicating it is a count record indicating the number of S1 records
-  # * 03 Hexadecimal 03 (decimal 3), indicating that three character pairs follow.
-  # * 00 04 Hexadecimal 0004 (decimal 4), indicating that there are four data records previous to this record.
-  # * F8 The checksum.
-  #
-  # The S9 record is comprised as follows:
-  #
-  # * S9 S-record type S9, indicating it is a termination record.
-  # * 03 Hexadecimal 03 (decimal 3), indicating that three character pairs follow.
-  # * 00 00 The address field, hexadecimal 0 (decimal 0) indicating the starting execution address.
-  # * FC The checksum.
-  #
-  # ### Additional Notes
-  #
-  # There isn't any evidence that Motorola ever has made use of the header information within the data field
-  # of the S0 record, as described above. This must have been used by some third party vendors.
-  # This is the only place that a 78-byte limit on total record length or 64-byte limit on data length is
-  # documented. These values shouldn't be trusted for the general case.
-  #
-  # The count field can have values in the range of 0x3 (2 bytes of address + 1 byte checksum = 3, a not
-  # very useful record) to 0xff; this is the count of remaining character pairs, including checksum.
-  # If you write code to convert S-Records, you should always assume that a record can be as long as 514
-  # (decimal) characters in length (255 * 2 = 510, plus 4 characters for the type and count fields), plus
-  # any terminating character(s).
-  #
-  # That is, in establishing an input buffer in C, you would declare it to be
-  # an array of 515 chars, thus leaving room for the terminating null character.
-  class SRecord < Base
-    def self.match?(snippet)
-      snippet.all? do |line|
-        line.empty? || line =~ /^S[01235789]/
-      end
-    end
-
-    def start_address
-      @start_address ||= begin
-        lines.each do |line|
-          if line =~ /^S([789])(.*)/
-            type = Regexp.last_match[1]
-            case type
-            when '7'
-              return line.slice(4, 8).to_i(16)
-            when '8'
-              return line.slice(4, 6).to_i(16)
-            when '9'
-              return line.slice(4, 4).to_i(16)
-            end
-          end
-        end
-      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 = []
-      lines.each do |line|
-        # Only if the line is an s-record with data...
-        if line =~ /^S([1-3])/
-          type = Regexp.last_match[1].to_i(16)    # S-record type, 1-3
-          # Set the matcher to capture x number of bytes dependent on the s-rec type
-          addr_matcher = '\w\w' * (1 + type)
-          line.strip =~ /^S\d\w\w(#{addr_matcher})(\w*)\w\w$/   # $1 = address, $2 = data
-          addr = Regexp.last_match[1].to_i(16)
-          @start_address ||= addr
-          @start_address = addr if addr < @start_address
-          data = Regexp.last_match[2]
-          data_matcher = '\w\w' * options[:data_width_in_bytes]
-          data.scan(/#{data_matcher}/).each do |data_packet|
-            result << [addr, data_packet.to_i(16)]
-            addr += options[:data_width_in_bytes]
-          end
-          # If a partial word is left over
-          if (remainder = data.length % (2 * options[:data_width_in_bytes])) > 0
-            result << [addr, data[data.length - remainder..data.length].to_i(16)]
-          end
-        end
-      end
-      result
-    end
-  end
-end
+module OrigenMemoryImage
+  # An S-record file consists of a sequence of specially formatted ASCII character strings. An S-record will
+  # be less than or equal to 78 bytes in length.
+  # The order of S-records within a file is of no significance and no particular order may be assumed.
+  #
+  # The general format of an S-record follows:
+  #
+  #   +-------------------//------------------//-----------------------+
+  #   | type | count | address  |            data           | checksum |
+  #   +-------------------//------------------//-----------------------+
+  #
+  # type
+  # : A char[2] field. These characters describe the type of record (S0, S1, S2, S3, S5, S7, S8, or S9).
+  #
+  # count
+  # : A char[2] field. These characters when paired and interpreted as a hexadecimal value, display
+  # the count of remaining character pairs in the record.
+  #
+  # address
+  # : A char[4,6, or 8] field. These characters grouped and interpreted as a hexadecimal value,
+  # display the address at which the data field is to be loaded into memory. The length of the field depends
+  # on the number of bytes necessary to hold the address. A 2-byte address uses 4 characters, a 3-byte
+  # address uses 6 characters, and a 4-byte address uses 8 characters.
+  #
+  # data
+  # : A char [0-64] field. These characters when paired and interpreted as hexadecimal values represent
+  # the memory loadable data or descriptive information.
+  #
+  # checksum
+  # : A char[2] field. These characters when paired and interpreted as a hexadecimal value display
+  # the least significant byte of the ones complement of the sum of the byte values represented by the pairs
+  # of characters making up the count, the address, and the data fields.
+  #
+  # Each record is terminated with a line feed. If any additional or different record terminator(s) or delay
+  # characters are needed during transmission to the target system it is the responsibility of the
+  # transmitting program to provide them.
+  #
+  # #### S0 Record
+  #
+  # The type of record is 'S0' (0x5330). The address field is unused and will be filled with zeros
+  # (0x0000). The header information within the data field is divided into the following subfields.
+  #
+  # * mname is char[20] and is the module name.
+  # * ver is char[2] and is the version number.
+  # * rev is char[2] and is the revision number.
+  # * description is char[0-36] and is a text comment.
+  #
+  # Each of the subfields is composed of ASCII bytes whose associated characters, when paired, represent one
+  # byte hexadecimal values in the case of the version and revision numbers, or represent the hexadecimal
+  # values of the ASCII characters comprising the module name and description.
+  #
+  # #### S1 Record
+  #
+  # The type of record field is 'S1' (0x5331). The address field is intrepreted as a 2-byte
+  # address. The data field is composed of memory loadable data.
+  #
+  # #### S2 Record
+  #
+  # The type of record field is 'S2' (0x5332). The address field is intrepreted as a 3-byte
+  # address. The data field is composed of memory loadable data.
+  #
+  # #### S3 Record
+  #
+  # The type of record field is 'S3' (0x5333). The address field is intrepreted as a 4-byte
+  # address. The data field is composed of memory loadable data.
+  #
+  # #### S5 Record
+  #
+  # The type of record field is 'S5' (0x5335). The address field is intrepreted as a 2-byte value
+  # and contains the count of S1, S2, and S3 records previously transmitted. There is no data field.
+  #
+  # #### S7 Record
+  #
+  # The type of record field is 'S7' (0x5337). The address field contains the starting execution
+  # address and is intrepreted as 4-byte address. There is no data field.
+  #
+  # #### S8 Record
+  #
+  # The type of record field is 'S8' (0x5338). The address field contains the starting execution
+  # address and is intrepreted as 3-byte address. There is no data field.
+  #
+  # #### S9 Record
+  #
+  # The type of record field is 'S9' (0x5339). The address field contains the starting execution
+  # address and is intrepreted as 2-byte address. There is no data field.
+  #
+  # ### Example
+  #
+  # Shown below is a typical S-record format file.
+  #
+  #   S00600004844521B
+  #   S1130000285F245F2212226A000424290008237C2A
+  #   S11300100002000800082629001853812341001813
+  #   S113002041E900084E42234300182342000824A952
+  #   S107003000144ED492
+  #   S5030004F8
+  #   S9030000FC
+  #
+  # The file consists of one S0 record, four S1 records, one S5 record and an S9 record.
+  #
+  # The S0 record is comprised as follows:
+  #
+  # * S0 S-record type S0, indicating it is a header record.
+  # * 06 Hexadecimal 06 (decimal 6), indicating that six character pairs (or ASCII bytes) follow.
+  # * 00 00 Four character 2-byte address field, zeroes in this example.
+  # * 48 44 52 ASCII H, D, and R - "HDR".
+  # * 1B The checksum.
+  #
+  # The first S1 record is comprised as follows:
+  #
+  # * S1 S-record type S1, indicating it is a data record to be loaded at a 2-byte address.
+  # * 13 Hexadecimal 13 (decimal 19), indicating that nineteen character pairs, representing a 2 byte address,
+  # * 16 bytes of binary data, and a 1 byte checksum, follow.
+  # * 00 00 Four character 2-byte address field; hexidecimal address 0x0000, where the data which follows is to
+  #   be loaded.
+  # * 28 5F 24 5F 22 12 22 6A 00 04 24 29 00 08 23 7C Sixteen character pairs representing the actual binary
+  #   data.
+  # * 2A The checksum.
+  # * The second and third S1 records each contain 0x13 (19) character pairs and are ended with checksums of 13
+  #   and 52, respectively. The fourth S1 record contains 07 character pairs and has a checksum of 92.
+  #
+  # The S5 record is comprised as follows:
+  #
+  # * S5 S-record type S5, indicating it is a count record indicating the number of S1 records
+  # * 03 Hexadecimal 03 (decimal 3), indicating that three character pairs follow.
+  # * 00 04 Hexadecimal 0004 (decimal 4), indicating that there are four data records previous to this record.
+  # * F8 The checksum.
+  #
+  # The S9 record is comprised as follows:
+  #
+  # * S9 S-record type S9, indicating it is a termination record.
+  # * 03 Hexadecimal 03 (decimal 3), indicating that three character pairs follow.
+  # * 00 00 The address field, hexadecimal 0 (decimal 0) indicating the starting execution address.
+  # * FC The checksum.
+  #
+  # ### Additional Notes
+  #
+  # There isn't any evidence that Motorola ever has made use of the header information within the data field
+  # of the S0 record, as described above. This must have been used by some third party vendors.
+  # This is the only place that a 78-byte limit on total record length or 64-byte limit on data length is
+  # documented. These values shouldn't be trusted for the general case.
+  #
+  # The count field can have values in the range of 0x3 (2 bytes of address + 1 byte checksum = 3, a not
+  # very useful record) to 0xff; this is the count of remaining character pairs, including checksum.
+  # If you write code to convert S-Records, you should always assume that a record can be as long as 514
+  # (decimal) characters in length (255 * 2 = 510, plus 4 characters for the type and count fields), plus
+  # any terminating character(s).
+  #
+  # That is, in establishing an input buffer in C, you would declare it to be
+  # an array of 515 chars, thus leaving room for the terminating null character.
+  class SRecord < Base
+    def self.match?(snippet)
+      snippet.all? do |line|
+        line.empty? || line =~ /^S[01235789]/
+      end
+    end
+
+    def start_address
+      @start_address ||= begin
+        lines.each do |line|
+          if line =~ /^S([789])(.*)/
+            type = Regexp.last_match[1]
+            case type
+            when '7'
+              return line.slice(4, 8).to_i(16)
+            when '8'
+              return line.slice(4, 6).to_i(16)
+            when '9'
+              return line.slice(4, 4).to_i(16)
+            end
+          end
+        end
+      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 = []
+      lines.each do |line|
+        # Only if the line is an s-record with data...
+        if line =~ /^S([1-3])/
+          type = Regexp.last_match[1].to_i(16)    # S-record type, 1-3
+          # Set the matcher to capture x number of bytes dependent on the s-rec type
+          addr_matcher = '\w\w' * (1 + type)
+          line.strip =~ /^S\d\w\w(#{addr_matcher})(\w*)\w\w$/   # $1 = address, $2 = data
+          addr = Regexp.last_match[1].to_i(16)
+          @start_address ||= addr
+          @start_address = addr if addr < @start_address
+          data = Regexp.last_match[2]
+          data_matcher = '\w\w' * options[:data_width_in_bytes]
+          data.scan(/#{data_matcher}/).each do |data_packet|
+            result << [addr, data_packet.to_i(16)]
+            addr += options[:data_width_in_bytes]
+          end
+          # If a partial word is left over
+          if (remainder = data.length % (2 * options[:data_width_in_bytes])) > 0
+            result << [addr, data[data.length - remainder..data.length].to_i(16)]
+          end
+        end
+      end
+      result
+    end
+  end
+end