origen_debuggers 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c69434410a715da3818e4cabc0246700dd0e7a52
-  data.tar.gz: 55f7bb58c4aa7addbf790e5552356f30bf9abcb3
+  metadata.gz: 3953a38f824c2c77649cf0059f8176f646396847
+  data.tar.gz: dbf6a2c4c0a22d7aff1ad56468e914216aa5ff65
 SHA512:
-  metadata.gz: ddfb4384f7a2901c05543c4277b784ae2d9e864c4caa3a8fb3db5720aed9173913fea668b3e772f085ea6d5c96c5faf460b95ff060ffb41f0b1cd3f94f61cf7b
-  data.tar.gz: 55edbaaab07ab7fe8efd089a3464bcf187edd91387162846f8cbb086423ace9d5f48c07a35fbda7edd94ba8d75aacfc306e1f6f5ff7976bd2e74a55e0ada876d
+  metadata.gz: f18be4760f48bc01f20eb6612a84ddd1cef548e47b9542a5e92558027b622cac8e1c74cba855995520028fe87ec590e71b87f34d16ae3ed2478d9d115643963b
+  data.tar.gz: 155582f087d66bd897e38b211f285ce03537f497e805ecab57fd94079b31181c59891ce7ed6428d69833589e6364f64fe0cde714e1a79785d488002c9064951b

data/config/version.rb

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

data/lib/origen_debuggers/j_link.rb

@@ -226,21 +226,47 @@ module OrigenDebuggers
 
       # Read 8 bits of data to the given byte address
       def read8(data, options = {})
-        read_memory(extract_address(data, options), number_of_bytes: 1)
+        read_memory(extract_address(data, options), number: 1)
       end
       alias_method :read_byte, :read8
       alias_method :read_8, :read8
 
       # Read 16 bits of data to the given byte address
       def read16(data, options = {})
-        read_memory(extract_address(data, options), number_of_bytes: 2)
+        read_memory(extract_address(data, options), number: 2)
       end
       alias_method :read_word, :read16
       alias_method :read_16, :read16
 
       # Read 32 bits of data to the given byte address
+      #
+      # data can be array of registers, if array of data then will auto-incrememnt address
       def read32(data, options = {})
-        read_memory(extract_address(data, options), number_of_bytes: 4)
+        options = { optimize: false,   # whether to use a single command to do the read
+                    # user may care regarding endianness
+                    size:     32,        # size of each item in bits
+                    number:   1,        # default number of items
+        }.merge(options)
+        options[:optimize] = options[:optimized] if options[:optimized]
+
+        if data.is_a?(Array)
+          if options[:optimize]
+            # for optimized option assume single starting address for data in array
+            read_memory(extract_address(data, options), size: options[:size], number: data.length)
+          else
+            data.each_index do |i|
+              data_item = data[i]
+              # do separate writes for each 32-bit word
+              read_memory(extract_address(data_item, options) + i * (options[:size] / 8), size: options[:size])
+            end
+          end
+        else
+          if options[:optimize]
+            read_memory(extract_address(data, options), size: options[:size], number: options[:number])
+          else
+            read_memory(extract_address(data, options), number: (options[:size] / 8))
+          end
+        end
       end
       alias_method :read_longword, :read32
       alias_method :read_32, :read32
@@ -341,11 +367,41 @@ module OrigenDebuggers
 
     # Other methods can expose unique features of a given debugger
     module Custom
+      def set_interface(interface)
+        # set interface and reset
+        value = interface == :swd ? 1 : 0   # set interface : JTAG=0, SWD=1
+        dw "si #{value}"
+        # pull a reset now
+        dw 'RSetType 2' # reset via reset pin which should be same as manual reset pin
+        # toggle.  Also forces CPU to halt when it comes out of reset
+        dw 'r'          # reset and halts the device (prob not needed)
+        dw 'halt'       # halt core just in case
+      end
+
+      def halt
+        dw 'halt'
+      end
+
+      def quit
+        dw 'q'
+      end
+
       def read_memory(address, options = {})
         options = {
-          number_of_bytes: 1
+          number: 1,    # number of items to read
+          size:   8     # number of bits in each item
         }.merge(options)
-        dw "mem 0x#{address.to_s(16).upcase}, #{options[:number_of_bytes]}"
+
+        if options[:size] == 32
+          dw "mem32 0x#{address.to_s(16).upcase}, #{options[:number].to_hex}"
+        elsif options[:size] == 16
+          dw "mem16 0x#{address.to_s(16).upcase}, #{options[:number].to_hex}"
+        elsif options[:size] == 8
+          dw "mem 0x#{address.to_s(16).upcase}, #{options[:number].to_hex}"
+          # not sure difference between mem and mem8
+        else
+          fail 'You must supply a valid :size option!'
+        end
       end
     end
     include Custom

data/pattern/_workout.rb

@@ -34,11 +34,38 @@ ss "Verify write16"
 $tester.write16 0x55AA, :address => 0x12
 ss "Verify write32" 
 $tester.write32 0x55AA_3344, :address => 0x12
+
+ss "Verify read8"
+$tester.read8 0x55, :address => 0x12
+ss "Verify read16"
+$tester.read16 0x55AA, :address => 0x12
+ss "Verify read32"
+$tester.read32 0x55AA_3344, :address => 0x12
+ss "Verify read32, optimized"
+$tester.read32 0x55AA_3344, address: 0x12, optimize:true
+
+ss "Verify Array of 32-bit data"
+$tester.read32 [0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF], address: 0x12
+ss "Verify Array of 32-bit data, optimized"
+$tester.read32 [0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF], address: 0x12, optimize: true
+
 ss "Verify write with a register" 
 $tester.write $dut.reg(:reg32)
 ss "Verify write with a data value" 
 $tester.write 0x55, :address => 0x12, :size => 8
 ss "Verify read with a register" 
 $tester.read $dut.reg(:reg32)
-ss "Verify read with a data value" 
+ss "Verify read with a register, optimized" 
+$tester.read $dut.reg(:reg32), optimize: true
+ss "Verify read with register and following 3 words, optimized" 
+$tester.read $dut.reg(:reg32), number: 4, optimize: true
+ss "Verify read with an 8-bit data value" 
 $tester.read 0x55, :address => 0x12, :size => 8
+ss "Verify read with a 16-bit data value" 
+$tester.read 0x5555, :address => 0x12, :size => 16
+ss "Verify read with a 32-bit data value" 
+$tester.read 0x55555555, :address => 0x12, :size => 32
+
+
+ss "Verify delay of 10k mS"
+$tester.delay(10000)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_debuggers
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -112,10 +112,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 Origen tester models to drive bench debuggers such as the Segger
   J-Link.
 test_files: []
-has_rdoc: