origen_arm_debug 0.9.0 → 0.10.0.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4a9f1dc701be4b75209634978ffff6e9c608ea6
-  data.tar.gz: f4ac35a546afb37109a02b46fdd099cdb51c2b74
+  metadata.gz: 66853aab2d9e6fe3b32b0ac16c9ef5f64eb04bf1
+  data.tar.gz: 511bfce260da1acec74db03809663b1c8f811a4c
 SHA512:
-  metadata.gz: 9bd87b22a6ba0fa200c94b42554cf365461f845f71823579069c986aedda124dcd9c225d0e5a1fab77bae6a1684fc579e7a82c6e2fdb9878bb58c286db0ea45e
-  data.tar.gz: d1e8c9efbbd74db7d121a900781ba5e245473d8acb1bc78f1655dca5df9bb0937417bdbb173c8103708deb3963a5d7bb6b0aba3cf18b923f1839817b6f7923f2
+  metadata.gz: 527132a80c2ac9fe48695d7321d4121c88c8aea2e94ca6096b4f29dd7c7efddc3a19f1dcac3b1bb508d9c4165a3f70c0ed4028f24c12f9fbf7e84d79db072f3e
+  data.tar.gz: 6a433640fd0a47fa972056a1d1dbc9875cb800dd3263b77f487f56fdd02f46edeb46832e2c7e1b8f135ac3923964c19eabfb5d02066b7a4b0dbc486e8d8ca4fa

data/config/application.rb

@@ -42,6 +42,7 @@ class OrigenARMDebugApplication < Origen::Application
   def before_deploy_site 
     Dir.chdir Origen.root do 
       system "origen examples -c" 
+      system "origen specs -c" 
       dir = "#{Origen.root}/web/output/coverage"        
       FileUtils.remove_dir(dir, true) if File.exists?(dir)  
       system "mv #{Origen.root}/coverage #{dir}" 

data/config/version.rb

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

data/lib/origen_arm_debug/swj_dp.rb

@@ -34,6 +34,9 @@ module OrigenARMDebug
 
       add_reg :ir,        0x00,  4, data: { pos: 0, bits: 4 }    # ARM-JTAG Instruction Register
 
+      add_reg :swd_dp,    0x00, 32, data: { pos: 0, bits: 32 }   # SWD Register
+
+      # jtag-dp only
       add_reg :dpacc,     0x00, 35, rnw:  { pos: 0 },            # DP-Access Register (DPACC)
                                     a:    { pos: 1, bits: 2 },
                                     data: { pos: 3, bits: 32 }
@@ -42,7 +45,6 @@ module OrigenARMDebug
                                     a:    { pos: 1, bits: 2 },
                                     data: { pos: 0, bits: 32 }
 
-      # jtag-dp only
       add_reg :idcode,    0x00, 32, data: { pos: 0, bits: 32 }   # Device ID Code Register (IDCODE)
       add_reg :abort,     0x00, 35, rnw:  { pos: 0 },            # Abort Register (ABORT)
                                     a:    { pos: 1, bits: 2 },
@@ -69,7 +71,7 @@ module OrigenARMDebug
       if protocol == :swd
         case name
           when :idcode, :ctrl_stat, :rdbuff, :wcr, :resend
-            dpacc_access(name, 1, random, options)
+            dpacc_access(name, 1, data, options)
           when :abort, :ctrl_stat
             log.error "#{name} #{protocol.to_s.upcase}-DP register is write-only!"
           else
@@ -282,9 +284,22 @@ module OrigenARMDebug
     def acc_access_swd(addr, rwb, ap_dp, data, options = {})
       _name = options.delete(:name)
       if (rwb == 1)
-        swd.read(ap_dp, addr, options)
+        reg(:swd_dp).address = addr
+        reg(:swd_dp).bits(:data).clear_flags
+        reg(:swd_dp).bits(:data).write(data)
+        _mask = options[:mask] || 0xFFFFFFFF
+        _store = options[:store] || 0x00000000
+        0.upto(31) do |i|
+          reg(:swd_dp).bits(:data)[i].read if _mask[i] == 1
+          reg(:swd_dp).bits(:data)[i].store if _store[i] == 1
+        end
+        options = options.merge(size: reg(:swd_dp).size)
+        swd.read(ap_dp, reg(:swd_dp), options)
       else
-        swd.write(ap_dp, addr, data, options)
+        reg(:swd_dp).bits(:data).write(data)
+        reg(:dpacc).address = addr
+        options = options.merge(size: reg(:swd_dp).size)
+        swd.write(ap_dp, reg(:swd_dp), reg(:swd_dp).data, options)
       end
       options = { w_delay: 10 }.merge(options)
       swd.swd_dio_to_0(options[:w_delay])

data/pattern/read_write_reg_swd.rb

@@ -1,5 +1,9 @@
 Pattern.create do
   $dut_swd = $dut
+
+  $dut_swd.reg(:test).write!(0x0000FF01)
+  $dut.reg(:test).read(0xAAAAAAAA)
+  
   $dut_swd.arm_debug.swj_dp.read_dp(:idcode, 0xba5eba11, mask: 0x00000000)
   $dut_swd.arm_debug.swj_dp.read_dp(:idcode, 0xba5eba11)
   $dut_swd.arm_debug.swj_dp.read_dp(:wcr, 0x00000000)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_arm_debug
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0.pre0
 platform: ruby
 authors:
 - Ronnie Lajaunie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen