origen_arm_debug 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 856e1631d06c817c9ca0053ccd7c21e3c8c01162
-  data.tar.gz: 933943950a63f6373e326ab7b88240d6be6bd000
+  metadata.gz: a4ce85678b97c90ebf41f4dff8b8fad020fe9cfa
+  data.tar.gz: ca74317b6cd30d1145571c337b842351ad401ef8
 SHA512:
-  metadata.gz: 6bcf6b796b955d29b8aaed2960265cf1a07993cef4ff747018735df53c10914bf291cd3c35203cab20db21bc8c2d9ba7e8b177e13a9f9adde55913a29039def9
-  data.tar.gz: 7dd18c6981b08f34574a6f92cc8791e57d5d3be63abdb840e6b2c7d88189c8f87ea36fbad2d8effcd6b37f8e4ad0ad8bf4446c2464f8f3369c50b22109899c7d
+  metadata.gz: 2579e71201e40ffb48f66196c3eac4c7cb0f94828b0a158ffbb8f62f84fb800c3f70590e9f83f4f6e6b138cc849c96a1e0e003ae733d84087e320cde771a15b7
+  data.tar.gz: d93cc73c36b6761ec33fd8da7f79b5ac5964d11a0b3be4f5632520f36a69fbc5edc467a2cea9bf1b3ec06bc9dbd9f9a6b77eb30cce3292bccf71237a62591104

data/config/version.rb

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

data/lib/origen_arm_debug/mem_ap.rb

@@ -68,9 +68,11 @@ module OrigenARMDebug
     def read_register(reg_or_val, options = {})
       if reg_or_val.respond_to?(:data)
         addr = reg_or_val.addr
+        rdata = reg_or_val.data
         options = { reg: reg_or_val }.merge(options)
       else
         addr = reg_or_val                 # if not a register, use the 'val' as target addr
+        rdata = 0
       end
 
       options = { size: 32 }.merge(options)
@@ -141,7 +143,7 @@ module OrigenARMDebug
       set_size(size)
       set_addr(addr)
       debug_port.read_ap(drw_reg_addr, options)
-      rdata = get_rdata(size, addr, rdata)
+      rdata = get_rdata(size, addr, 0)
       increment_addr
 
       cc "MEM-AP(#{@name}): R-#{size.to_s(10)}: "\
@@ -316,11 +318,11 @@ module OrigenARMDebug
       current_csw_2_0 = @current_csw & 0x00000007
       if (current_csw_5_4 == 0b01)
         case current_csw_2_0
-          when 0b000 then @current_tar += 1   # Increment single
-          when 0b001 then @current_tar += 2   # Increment single
-          when 0b010 then @current_tar += 4   # Increment single
+          when 0 then @current_tar += 1   # Increment single
+          when 1 then @current_tar += 2   # Increment single
+          when 2 then @current_tar += 4   # Increment single
         end
-      elsif (current_csw_5_4 == 0b10)
+      elsif (current_csw_5_4 == 2)
         @current_tar += 4                     # Increment packed
       end
 
@@ -330,52 +332,26 @@ module OrigenARMDebug
       end
     end
 
-    # Create a bit-wise mask based on size, address and mask parameters.
-    #
-    # @param [Integer] size Size of data, supports 8-bit, 16-bit, and 32-bit
-    # @param [Integer] addr Address of data to be read from or written to
-    # @param [Integer] mask Mask for full data, used to create nibble mask
-    def get_mask(size, addr, mask)
-      addr_1_0 &= 0x00000003
-      case size
-        when 8
-          case addr_1_0
-            when 0b00 then mask &= 0x000000ff
-            when 0b01 then mask &= 0x0000ff00
-            when 0b10 then mask &= 0x00ff0000
-            when 0b11 then mask &= 0xff000000
-          end
-        when 16
-          case addr_1_0
-            when 0b00 then mask &= 0x0000ffff
-            when 0b10 then mask &= 0xffff0000
-          end
-        when 32
-          mask &= 0xffffffff
-      end
-      mask
-    end
-
     # Create a bit-wise read-data based on size, address and rdata parameters.
     #
     # @param [Integer] size Size of data, supports 8-bit, 16-bit, and 32-bit
     # @param [Integer] addr Address of data to be read from or written to
     # @param [Integer] rdata Full data for read, used to create nibble read data
     def get_rdata(size, addr, rdata)
-      addr_1_0 &= 0x00000003
+      addr_1_0 = addr & 0x00000003
       case size
         when 8
           case addr_1_0
-            when 0b00 then rdata = 0x000000ff & rdata
-            when 0b01 then rdata = 0x000000ff & (rdata >> 8)
-            when 0b10 then rdata = 0x000000ff & (rdata >> 16)
-            when 0b11 then rdata = 0x000000ff & (rdata >> 24)
+            when 0 then rdata = 0x000000ff & rdata
+            when 1 then rdata = 0x000000ff & (rdata >> 8)
+            when 2 then rdata = 0x000000ff & (rdata >> 16)
+            when 3 then rdata = 0x000000ff & (rdata >> 24)
           end
         when 16
           case addr_1_0
-                  when 0b00 then rdata = 0x0000ffff & rdata
-                  when 0b10 then rdata = 0x0000ffff & (rdata >> 16)
-                end
+            when 0 then rdata = 0x0000ffff & rdata
+            when 2 then rdata = 0x0000ffff & (rdata >> 16)
+          end
         when 32
           rdata = rdata
       end
@@ -388,19 +364,19 @@ module OrigenARMDebug
     # @param [Integer] addr Address of data to be read from or written to
     # @param [Integer] wdata Full data for write, used to create nibble write data
     def get_wdata(size, addr, wdata);
-      addr_1_0 &= 0x00000003
+      addr_1_0 = addr & 0x00000003
       case size
         when 8
           case addr_1_0
-                  when 0b00 then wdata = 0x000000ff & wdata
-                  when 0b01 then wdata = 0x0000ff00 & (wdata << 8)
-                  when 0b10 then wdata = 0x00ff0000 & (wdata << 16)
-                  when 0b11 then wdata = 0xff000000 & (wdata << 24)
-                end
+            when 0 then wdata = 0x000000ff & wdata
+            when 1 then wdata = 0x0000ff00 & (wdata << 8)
+            when 2 then wdata = 0x00ff0000 & (wdata << 16)
+            when 3 then wdata = 0xff000000 & (wdata << 24)
+          end
         when 16
           case addr_1_0
-                  when 0b00 then wdata = 0x0000ffff & wdata
-                  when 0b10 then wdata = 0xffff0000 & (wdata << 16)
+            when 0 then wdata = 0x0000ffff & wdata
+            when 2 then wdata = 0xffff0000 & (wdata << 16)
           end
         when 32
           wdata = wdata

data/lib/origen_arm_debug/swj_dp.rb

@@ -383,7 +383,7 @@ module OrigenARMDebug
       _name = options.delete(:name)
       if !options[:r_attempts].nil?
         attempts = options[:r_attempts]
-      elsif !options[:r_attempts].nil?
+      elsif !options[:w_attempts].nil?
         attempts = options[:w_attempts]
       else
         attempts = 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_arm_debug
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Ronnie Lajaunie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen