origen_arm_debug 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e80b1afc8a982d2a7ec2041ad61d4f4eedb011abc09a4931d669747c7dc3230c
-  data.tar.gz: 9e4712df2359e3c55674282f9c0ac0169d47e9e7138a59e4a66773d1b087b223
+  metadata.gz: 8129ae2a9371cfed96eeddab0b431b7fabea04648fe690a8e5b71232fa34cb89
+  data.tar.gz: d605f5cf618b53f2eff53ed0af3eab442d6bfe0a4292abd37895e51ddd1436bc
 SHA512:
-  metadata.gz: e3b956766978d89be7ebdeba678195ae916542f1c3b861bc35ec224966f02aea2b3fc4ec3bff87d0809f288a355b745a1334a957c710040a595265e11d4574e6
-  data.tar.gz: 1607a271f01f25ab358205b51bfd9d0837c413041f2c2b57a5f43f8282ccba417d90eb24d32b02b4863343dc41707b155549ea6c54c9d7d370fdde04f67aaaef
+  metadata.gz: 4cfc2498bad1094ec2e3fc39bceb5f8c0d72fb8f984f98f5934d6fcd4d78db4facaac0e1784f252e5cd301d0faaf9a1b1bfbedab41ba1d1cbc66a0cada20c94c
+  data.tar.gz: 2642fa31000ef162330132b2acd1ba1ffd2ac75639b96201b31c9800204c7712376bbcfed4ab11039e2577248d040201c68d419b12c032658e34bfe78fe1c41c

data/config/boot.rb

@@ -3,3 +3,4 @@ require "origen_arm_debug"
 require "origen_arm_debug_dev/dut"
 require "origen_arm_debug_dev/dut_jtag"
 require "origen_arm_debug_dev/dut_swd"
+require "origen_arm_debug_dev/dut_dual_dp"

data/config/commands.rb

@@ -17,11 +17,11 @@ aliases ={
 # Now branch to the specific task code
 case @command
 
-# when "specs"
-#   require "rspec"
-#   exit RSpec::Core::Runner.run(['spec'])
+when "specs"
+  require "rspec"
+  exit RSpec::Core::Runner.run(['spec'])
 
-when "examples"    # , "test"  
+when "examples", "test"  
   Origen.load_application
   status = 0
   
@@ -30,6 +30,8 @@ when "examples"    # , "test"
   load "#{Origen.top}/lib/origen/commands/generate.rb"
   ARGV = %w(workout -t swd -e j750 -r approved)
   load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(workout -t dual_dp -e j750 -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
   ARGV = %w(workout -t config_test -e j750 -r approved/config_test)
   load "#{Origen.top}/lib/origen/commands/generate.rb"
     
@@ -44,12 +46,12 @@ when "examples"    # , "test"
      status = 1
   end
   puts
-#  if @command == "test"
-#    Origen.app.unload_target!
-#    require "rspec"
-#    result = RSpec::Core::Runner.run(['spec'])
-#    status = status == 1 ? 1 : result
-#  end
+  if @command == "test"
+    Origen.app.unload_target!
+    require "rspec"
+    result = RSpec::Core::Runner.run(['spec'])
+    status = status == 1 ? 1 : result
+  end
   exit status
 
 # Always leave an else clause to allow control to fall back through to the

data/config/version.rb

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

data/lib/origen_arm_debug/dap_controller.rb

@@ -3,12 +3,41 @@ module OrigenARMDebug
     include Origen::Controller
     include Helpers
 
+    attr_accessor :dp
+
     # Returns the currently enabled DP (or the only DP if only one
     # of them).
     # If no dp is enabled before calling this, it will choose the
     # SW_DP by default.
     def dp
-      dps.first
+      @dp ||= dps.first
+    end
+
+    def set_dp(dp)
+      if dps.size > 1
+        if dp == :swd || dp == :sw
+          @dp = dps.first
+        elsif dp == :jtag
+          @dp = dps.last
+        else
+          Origen.log.error 'origen_arm_debug: Only SWD and JTAG DP available'
+        end
+      else
+        Origen.log.warn 'origen_arm_debug: Ignoring set_dp call since only one DP is available'
+      end
+    end
+
+    def reset_dp
+      @dp = nil
+    end
+
+    def is_jtag?
+      dp.is_jtag?
+    end
+
+    def is_swd?
+      dp.is_swd?
     end
+    alias_method :is_sw?, :is_swd?
   end
 end

data/lib/origen_arm_debug/jtag_dp.rb

@@ -65,5 +65,14 @@ module OrigenARMDebug
     def abort
       reg(:abort)
     end
+
+    def is_jtag?
+      true
+    end
+
+    def is_swd?
+      false
+    end
+    alias_method :is_sw?, :is_swd?
   end
 end

data/lib/origen_arm_debug/sw_dp.rb

@@ -60,5 +60,14 @@ module OrigenARMDebug
     def abort
       reg(:abort)
     end
+
+    def is_jtag?
+      false
+    end
+
+    def is_swd?
+      true
+    end
+    alias_method :is_sw?, :is_swd?
   end
 end

data/lib/origen_arm_debug_dev/dut_dual_dp.rb

@@ -0,0 +1,34 @@
+module OrigenARMDebugDev
+  # Simple JTAG-specific dut model that inherits from protocol-agnostic DUT model
+  class DUAL_DP_DUT < DUT
+    include OrigenSWD
+    include OrigenJTAG
+
+    # Adds jtag-required pins to the simple dut model
+    # Returns nothing.
+    def initialize(options = {})
+      super
+      add_pin :tclk
+      add_pin :tdi
+      add_pin :tdo
+      add_pin :tms
+      add_pin :trst
+      add_pin :swd_clk
+      add_pin :swd_dio
+
+      options[:class_name] = 'OrigenARMDebug::DAP'
+      options[:mem_aps] = {
+        mem_ap: {
+          base_address:      0x00000000,
+          latency:           16,
+          apreg_access_wait: 8,
+          apmem_access_wait: 8,
+          csw_reset:         0x23000040
+        },
+        mdm_ap: 0x01000000
+      }
+      # Specify (customize) ARM Debug implementation details
+      sub_block :arm_debug, options
+    end
+  end
+end

data/pattern/workout.rb

@@ -1,4 +1,10 @@
-Pattern.create name: "workout_#{dut.arm_debug.dp.name}" do
+if Origen.app.target.name == 'dual_dp'
+  pattern_name = 'workout_dual_dp'
+else
+  pattern_name = "workout_#{dut.arm_debug.dp.name}"
+end
+
+Pattern.create name: pattern_name do
 
   ss "Tests of direct DP API"
   dp = dut.arm_debug.dp
@@ -58,4 +64,52 @@ Pattern.create name: "workout_#{dut.arm_debug.dp.name}" do
   dut.reg(:test).data = 0x0000FF01
   dut.reg(:test)[0].read!
 
+  if Origen.app.target.name == 'dual_dp'
+    ss "SWITCHING DP"
+    dut.arm_debug.set_dp(:jtag)
+
+    ss "Test write register, should write value 0xFF01"
+    dut.reg(:test).write!(0x0000FF01)
+
+    ss "Test write register with overlay, no subroutine"
+    dut.reg(:test).overlay('write_overlay')
+    dut.reg(:test).write!(0x0000FF01, no_subr: true)
+    dut.reg(:test).overlay(nil)
+
+    ss "Test write register with overlay, use subroutine if available"
+    dut.reg(:test).overlay('write_overlay_subr')
+    dut.reg(:test).write!(0x0000FF01)
+    dut.reg(:test).overlay(nil)
+
+    ss "Test read register, should read value 0x0000FF01"
+    dut.reg(:test).read!
+   
+    ss "Test read register, with overlay, no subroutine, should read value 0x0000FF01"
+    dut.reg(:test).overlay('read_overlay')
+    dut.reg(:test).read!(no_subr: true)
+    dut.reg(:test).overlay(nil)
+
+    ss "Test read register, with overlay, use subroutine if available"
+    dut.reg(:test).overlay('read_overlay_subr')
+    dut.reg(:test).read!
+    dut.reg(:test).overlay(nil)
+    
+    ss "Test read register with mask, should read value 0xXXXxxx1"
+    dut.reg(:test).read!(mask: 0x0000_000F)
+
+    ss "Test read register with store"
+    dut.reg(:test).store!
+
+    ss "Test bit level read, should read value 0xXXXxxx1"
+    dut.reg(:test).reset
+    dut.reg(:test).data = 0x0000FF01
+    dut.reg(:test)[0].read!
+
+    ss "RESETTING DP (to default)"
+    dut.arm_debug.reset_dp
+    ss "Test bit level read, should read value 0xXXXxxx1"
+    dut.reg(:test).reset
+    dut.reg(:test).data = 0x0000FF01
+    dut.reg(:test)[0].read!
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_arm_debug
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Ronnie Lajaunie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -97,6 +97,7 @@ files:
 - lib/origen_arm_debug/sw_dp.rb
 - lib/origen_arm_debug/sw_dp_controller.rb
 - lib/origen_arm_debug_dev/dut.rb
+- lib/origen_arm_debug_dev/dut_dual_dp.rb
 - lib/origen_arm_debug_dev/dut_jtag.rb
 - lib/origen_arm_debug_dev/dut_swd.rb
 - pattern/workout.rb